diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 16:30:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 16:30:38 +0000 |
commit | b88de9273ffc7b5be4252b799f57feab0c7ecb5a (patch) | |
tree | 9fadec164b5bc859c0a31a52d73c4be46c8325ce /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 307f10a4fc57f98b8ecddfca4e9b0d97cca5e089 (diff) | |
parent | 2ddf24b6a8da303508f36deac3e23e098b33a579 (diff) |
[automerger skipped] Merge "Do not disable tracing in zygote." am: 88be2985c4 am: aee51d9eab am: 2ddf24b6a8 -s ours
am skip reason: Change-Id I50e32a19c538dd255097c035836504b4746b172b with SHA-1 e38797be84 is in history
Change-Id: I646384dd98fb910e8533d373107b24afc763aa05
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions