diff options
| author | Nazanin Bakhshi <nazaninb@google.com> | 2019-03-09 07:03:14 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-09 07:03:14 -0800 |
| commit | 9b47328666b57a59f07afc2c13a10e39af5b5529 (patch) | |
| tree | 5ec93812cb15d4f486ad9d395e72fa80bd7be818 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0c02b9b32798f789107fd947163463d92acc930c (diff) | |
| parent | 4d2eceffab25f21c311a71d663b7a622b80613b6 (diff) | |
[automerger skipped] Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" am: 016409b3d5 am: 26891a4429
am: 4d2eceffab -s ours
am skip reason: change_id Icb90b5bd93845c29157cafddcd53335728638ec2 with SHA1 026451d9fb is in history
Change-Id: I70fdef535e1b58902d908b94254f8f6dfd147acd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions