summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRicky Wai <rickywai@google.com>2016-06-08 14:59:04 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-08 14:59:04 +0000
commit6438ca68a450523222223b1fffc3254319062f2d (patch)
tree5e3d30f67d062df303ae7a2553118aba6afc7ff9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent813627328fff5f51c7eb67b8689e2b2edc372847 (diff)
parent9e0a9bcc92866eabc74a5b072cd278ab4f3adf48 (diff)
Merge \"Merge \\\"Make Settings->Apps can handle work apps even work profile not enabled yet\\\" into nyc-dev am: 18c8690b7e am: 711629a27d\" into nyc-mr1-dev-plus-aosp
am: 9e0a9bcc92 Change-Id: Ibd25ae85aaeea7515c295bd78fe4bc84ccf2303d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions