diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 10:07:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 10:07:43 +0000 |
| commit | d3579addfabdc0f236b55955b6644cb427e16afb (patch) | |
| tree | 649277fd2f3478c87eece21225a9af4ee7574820 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8e258a182bb3d21390c2dc14f22d1cef7da37ddb (diff) | |
| parent | fee7e9913bf3e7e21b817dee93c24d9146202aca (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into oc-dev am: 6c1414ffac am: 8d37b54e76 -s ours am: e776ad2c63 -s ours am: fee7e9913b -s ours
am skip reason: subject contains skip directive
Change-Id: Iad167cc9497674c3e679721c6d6562c841b48dfd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions