diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:07:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:07:56 +0000 |
| commit | 7875c308a3926cc6b6e500371406a55b71cc475f (patch) | |
| tree | 0499fd7cab670d7543a006a636a61a070aed755b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 348b330f9bf29613f39fe9226d45915067fd81dd (diff) | |
| parent | 0651bb4f3afce1a78fc6696fda08dd77f2f897f5 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into pi-dev am: 321b255d93 -s ours am: 29043c67d8 am: 0651bb4f3a -s ours
am skip reason: subject contains skip directive
Change-Id: I17bce7f23416ef5239567ff33c0597cb6f6ecd4c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions