diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-12 09:13:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-12 09:13:36 +0000 |
| commit | 2991fea69e527d2711697f65283d84536bf17c31 (patch) | |
| tree | 98e3c8b2597645688238b730afb6e299e7384da2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e926c3f73913e32b61c6ad41192918d371cebf03 (diff) | |
| parent | b2307f8db48104fb14807db0b5531690c2eeaa3d (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into qt-qpr1-dev am: b2307f8db4 -s ours
am skip reason: subject contains skip directive
Change-Id: I97b81a597558d260ca738a0caf08a793a6d240be
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions