summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2016-10-13 19:24:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-13 19:24:50 +0000
commitab4867484981e7dbef983137fdaed4efe1a44579 (patch)
treee2fb2e04eeda51ad804ce26722976d4d8065e19e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent329fed87b9b401baa48ab840192a61847d44ed71 (diff)
parentd344b407df69c2dd52bbf5d0ea4e672c2ef95ca2 (diff)
Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp
am: d344b407df Change-Id: Ie75c36576a821c7faa720bfae54d47b5e5560f85
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions