diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-02-20 08:48:13 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-20 08:48:13 -0800 |
| commit | f43dd2bd1300437dcd354372be27bc6938eab8fb (patch) | |
| tree | 4863b6e214a83175cdb87a16cc62ba87de37900e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 818e8c1bf29b8de06f537274baadf0e2fb206150 (diff) | |
| parent | 31a61f6348b69c4dfc68e95c9a44e428234dd5f6 (diff) | |
[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
am: 31a61f6348 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 95bd7221f6 is in history
Change-Id: I76722b24202892034148a1c1030b8ca4d3417797
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions