diff options
| author | Martijn Coenen <maco@google.com> | 2019-11-15 00:23:13 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-15 00:23:13 -0800 |
| commit | 028239b5c1deb2ed5c487929c58737dab36b61c2 (patch) | |
| tree | 2452a38b50137f590ff1c2ed25a324d7e1fd39f2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | aa720b688092ccfe8295a9e180f346cb2e301b8c (diff) | |
| parent | c272f94077af1cab3951b723dbb2d7b364256efd (diff) | |
[automerger skipped] Merge "Re-land: Reconcile Zygote process name code with Q release." into stage-aosp-master am: 0b5937472e
am: c272f94077 -s ours
am skip reason: change_id Ice3eb966a88e6de5bc8834b60b54bcac31bf31db with SHA1 0d1890b0e0 is in history
Change-Id: Ie7a2592fc2b2ad61fa46690924bc22fa5f01ed5c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions