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:17:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-10-13 19:17:22 +0000
commitf051de84d53c58cbeb9d23a3088d1d3e3eedd317 (patch)
tree082ad13cc614c9bf16802f59a7faa6ac14494b19 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent490a70712944678852d8fb1873d77cc75bfe404d (diff)
parent9f65c6d01761c2bfae7e4a46e6f3ed33bff3405b (diff)
Merge "Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only" into nyc-mr1-dev am: 4bd56fbbee am: 622e97ffaf" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions