summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2017-08-14 22:46:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-14 22:46:25 +0000
commitbe796606ee5e2d237bc51a4b5fa15aaaeab29d61 (patch)
treeebd855c76385a897c34120a3f56b139c96f48cb5 /tools/aapt2/java/JavaClassGenerator.cpp
parent240a70f1e58af96154c05f3f79023f6b7c413291 (diff)
parentc82e45029e711b7fc83a3f5911a6ee5a0bccaef4 (diff)
Merge "Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev am: 21f3489653" into oc-mr1-dev
am: c82e45029e Change-Id: Ie0c0eb17b6db9693d828c1d163eb1f0d18172029
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions