| commit | 1320c7b7074f87a8371bdabac682f0e48c620e30 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Feb 02 16:28:38 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Feb 02 16:28:38 2020 +0000 |
| tree | f8fccb0e81a02f3785946a8a36d7c0dc8ceb3b4a | |
| parent | d8be135210f5dc4fd5d59511f887bf3ff0115750 [diff] | |
| parent | 6fb2bb1b4231ff2ed032889dc562dbb1239b3594 [diff] |
Merge changes I259a3f41,Id309a941 * changes: Guard the preserve settings logic in SettingsBackupAgent with a flag Do not restore settings marked as preserved in SettingsBackupAgent