diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-10 17:47:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-10 17:47:00 +0000 |
| commit | a27754f5cdf05e8408fc462d0cda73f20e39a4c8 (patch) | |
| tree | 7c741217d0f93dfb1dc5db465c7db4ad65cf538c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5d7dd7b2dd7b95f5f1dec1ed7b7bd50f352bf3b1 (diff) | |
| parent | 074acecf679010a7d38144c9eea5f3cdacb5ff5b (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 skip reason: subject contains skip directive
Change-Id: Id393a352e2318e08a57aa8f3cd038d0057c8adaf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions