summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorChavi Weingarten <chaviw@google.com>2017-08-04 20:40:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-04 20:40:13 +0000
commit57fe3036aa8c76a3f297648bf4401520b5a58e0f (patch)
tree7a9b5ee13c61461103b9f9e8f3af1898f628f4fa /tools/aapt2/java/JavaClassGenerator.cpp
parent45cab063223104c7c0390cac0194f878fe40bc6e (diff)
parentc36b2f0490dc1d00a5e63f7e5d352a8471108b67 (diff)
Merge "Only allow one turnScreenOn per app resume." into oc-dr1-dev
am: c36b2f0490 Change-Id: Ica77a650a769c282f97056b0779def22ee0d00e1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions