diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-11 23:24:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-11 23:24:38 +0000 |
| commit | bf6bdc48491d6a9f837e5aa936b360f8aec065a5 (patch) | |
| tree | 1ff455e46a12e84312b716b6ff3df6857fdd321f /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b75d9fdbed1d2608e052872de48880d422077756 (diff) | |
| parent | 23624a7823a8099a57b0c2b20d4b39fb14ccb010 (diff) | |
Merge changes from topic "am-e90d0d50cdd34695a4d19e0f9412f330"
* changes:
[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
[automerger skipped] DO NOT MERGE - Use TimingsTraceLog on SystemServiceManager and VoiceInteractionManagerService. am: ed30689e21 am: 88904f9cf3 -s ours am skip reason: subject contains skip directive
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions