summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-01 03:48:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-01 03:48:25 +0000
commit6017928f95a58282a007f3d198a2911cadfce881 (patch)
tree6ec3564d75a51fc93b058cc9bb8cc69f629a5cd9 /tools/aapt2/java/JavaClassGenerator.cpp
parentbce9e0e9398e85ff05fbf634b2b04016fe98317e (diff)
parent69c487548802327b5e3a994ba12df63639ed56f3 (diff)
Merge "Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into oc-dr1-dev am: 75c94b8788" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions