diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2019-07-31 10:15:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-31 10:15:34 -0700 |
| commit | 729fdab3a13f90d6dbcb98dfc13ea04251793cc3 (patch) | |
| tree | 2945274771b0deb7b87bb2dd2a1047f19f782415 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 3680ef3f82c79891955e452aef623ab0121ef6b8 (diff) | |
| parent | cfc242659bbd5583fdc464b139366efb25a49104 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde392 am: dd1882ec73" into qt-qpr1-dev-plus-aosp
am: cfc242659b -s ours
am skip reason: subject contains skip directive
Change-Id: I98c275c5789300f81928e59497d72af43826230a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions