diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-10 17:25:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-10 17:25:56 +0000 |
| commit | 074acecf679010a7d38144c9eea5f3cdacb5ff5b (patch) | |
| tree | aac9a634bf4348045e1d9b83c2c432813f1772f8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d9d727b959427998ea062df5bfe1d5871b76435d (diff) | |
| parent | 4f486e9f0be97103e1f3ee9446d5385baff12abe (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-mr1-dev am: 4f486e9f0b -s ours
am skip reason: subject contains skip directive
Change-Id: I25cc26ee2447031bef53ca7d950edfc1c85ea99f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions