summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorRicky Wai <rickywai@google.com>2016-06-08 14:58:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-08 14:58:53 +0000
commit813627328fff5f51c7eb67b8689e2b2edc372847 (patch)
tree5e3d30f67d062df303ae7a2553118aba6afc7ff9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent66af2f5ea98e080cd6807a2e204dec50367a62b7 (diff)
parentf8c23a5f12a52b198dfa8942b9efe2b00bdf1cbe (diff)
Merge \\\"Make Settings->Apps can handle work apps even work profile not enabled yet\\\" into nyc-dev am: 18c8690b7e am: dfe00c9ed6
am: f8c23a5f12 Change-Id: I99c452941f11b307a075540ec5c3e662443f9bde
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions