Skip to content
Commit 1320c7b7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I259a3f41,Id309a941 

* changes:
  Guard the preserve settings logic in SettingsBackupAgent with a flag
  Do not restore settings marked as preserved in SettingsBackupAgent
parents d8be1352 6fb2bb1b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment