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-10 21:01:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-10 21:01:44 +0000
commitdca2204ab5169bdf333d471611126bac6a799bfd (patch)
tree984619053e68b3e1c43e7f8186401b20048b0905 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentb2307f8db48104fb14807db0b5531690c2eeaa3d (diff)
parenta27754f5cdf05e8408fc462d0cda73f20e39a4c8 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev am: 4f486e9f0b -s ours am: 074acecf67 -s ours am: a27754f5cd
Change-Id: I9d6fa58f0ba0ecbefe678115ab2e0004afad46f4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions