diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-12 09:14:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-12 09:14:07 +0000 |
| commit | ea7607a07eb7b064a4bec951c4a9b4c014efc5aa (patch) | |
| tree | 98e3c8b2597645688238b730afb6e299e7384da2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2991fea69e527d2711697f65283d84536bf17c31 (diff) | |
| parent | dca2204ab5169bdf333d471611126bac6a799bfd (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 am: dca2204ab5 -s ours
am skip reason: subject contains skip directive
Change-Id: I28a6e361590febe9fee53f894d6a0bc5ac4467f6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions