summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-11 05:23:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-11 05:23:43 +0000
commit0651bb4f3afce1a78fc6696fda08dd77f2f897f5 (patch)
tree9c1f5e98951a604a9958a7d0ff4917c11b9bf2a6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4a1b488d5effc84b7417b5ffb7d716587844009d (diff)
parent29043c67d8008344c7d26f1f96383ff3f95a54fc (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into pi-dev am: 321b255d93 -s ours am: 29043c67d8
Change-Id: Ic8b7eb2750fe284076e320b039f8f2b61ab40c06
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions