diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2017-08-14 22:58:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-14 22:58:30 +0000 |
| commit | b34de16e3bbaba41332bafa53dd21eb37f099907 (patch) | |
| tree | 85ac286f3b4a2b29c1cb7a22661a9f5118dac0fe /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | ebd39077b5535c3e84e3f2a0604ad9ddf611b1c4 (diff) | |
| parent | e2e8301083173136bccaaf8ddbbc6ebeaf68d5b9 (diff) | |
Merge "Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev am: 21f3489653 am: b7aade045d" into oc-mr1-dev-plus-aosp
am: e2e8301083
Change-Id: Icc6c24fe9cceb0884b9cac5568fdcd4477c88626
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions