summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-10-13 19:14:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-10-13 19:14:08 +0000
commitd344b407df69c2dd52bbf5d0ea4e672c2ef95ca2 (patch)
tree082ad13cc614c9bf16802f59a7faa6ac14494b19 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentba297baa0412c6e8e9ba6ad54f0ce0990bb60940 (diff)
parent8371d28717a9cce2fcceff5cf799cdc0fb3b3c09 (diff)
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions