summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-06-27 19:07:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-27 19:07:24 +0000
commitbcd39d142e720733ff55d536bf89eee71e5aff14 (patch)
tree6804cebda7e0b1a91c26c1187dca95b179619364 /tools/aapt2/java/JavaClassGenerator.cpp
parent498556fa383c5a9c4121ae569753a860996bbfdd (diff)
parent6b94bb903af677aa0be0cedf0bf0e68a4f7e3340 (diff)
Merge "Merge "DO NOT MERGE: Add dynamic doze check for the active doze light sensor. am: 789954fb69 -s ours am: 1cd816eeac -s ours am: c994b07e98 am: 77b001f910" into oc-dr1-dev-plus-aosp am: a678041929"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions