diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-08 21:38:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 21:38:12 +0000 |
| commit | b3bf04dc56b4652393009b08bd0182c3d3d01227 (patch) | |
| tree | 3790b6f9ea3424eb83470691feee64485b93d547 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 323b9caaf1dd0a8fe489b6dd26b71066ee4f2280 (diff) | |
| parent | 3a49946a6be981e1fd25a1fed3b55f323f1c9eef (diff) | |
[automerger skipped] Merge "AudioService: increase audio mode timeout." into rvc-qpr-dev am: 33229d78b6 am: 3a49946a6b -s ours
am skip reason: Change-Id Ic1efc496931a5ab5fb9a28fc918dba1cf66a89df with SHA-1 b9088b22ed is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13181178
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I11903f4415b5dd444a17adced5f0b0c4c467022a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions