diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:08:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:08:53 +0000 |
| commit | 7bf62fe54008e6936c9f0d5a985287639541de5f (patch) | |
| tree | 0499fd7cab670d7543a006a636a61a070aed755b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fa8ed2c741d9391ae01d3ae8f97644602d73f998 (diff) | |
| parent | a8441e2058a487d6a233f42e037a2943a3a65a54 (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: d3579addfa -s ours am: a8441e2058 -s ours
am skip reason: subject contains skip directive
Change-Id: Icdac4d48d0125c0a2c44c2fb4afc553c26ad5558
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions