summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-06-29 02:33:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-29 02:33:28 +0000
commit92d643878ab9cb3f52b48c4eb5a03850a1faa2fe (patch)
tree30055c4311d54ee55e0d976bc13d2a2919d7a21e /tools/aapt2/java/JavaClassGenerator.cpp
parent49a5825195091c45e15c8c8e7154473cca39ac22 (diff)
parentdf9ddc333975a942e2010f4f632cc165c1c9ca9a (diff)
Merge "Merge "Further restrict activity launch on virtual displays" into oc-dev am: 36dbd3d43f am: 6e086877e5" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions