diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-02 16:28:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-02 16:28:38 +0000 |
| commit | 1320c7b7074f87a8371bdabac682f0e48c620e30 (patch) | |
| tree | f8fccb0e81a02f3785946a8a36d7c0dc8ceb3b4a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| 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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions