diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 23:24:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 23:24:25 +0000 |
| commit | 23624a7823a8099a57b0c2b20d4b39fb14ccb010 (patch) | |
| tree | e15c97d086ff856221b76d12aacb7162aac7c8df /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8041f463675fec5e9ad8b2e7c2dc3f11287f2222 (diff) | |
| parent | fcc25eb58fe52227d95731d53a7b15ba5bc69ec1 (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService." into qt-qpr1-dev am: bace1cd5a4 am: fcc25eb58f -s ours
am skip reason: subject contains skip directive
Change-Id: I75e53dccc34d2ff4d47970b0cd4b0a6473abcd07
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions