summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2017-07-31 12:42:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-31 12:42:17 +0000
commit5b69ea4b1a452205d03163e99ab3b05e84d226ad (patch)
treeffed28c649bc53ff079eb6baf34bf849b03a8bbf /tools/aapt2/java/JavaClassGenerator_test.cpp
parent5eca35d4a00faff0485fb1476ff3fb8faf194bc8 (diff)
parent86e49f224c9e80ba4c89ac5e9705ff3e015579ca (diff)
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a148
am: 86e49f224c Change-Id: Id2ce270c16978b6856598cbc5a2342ca1def27f0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions