diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-08 14:52:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-08 14:52:36 +0000 |
commit | 9e0a9bcc92866eabc74a5b072cd278ab4f3adf48 (patch) | |
tree | db7f86838efeb5b130a76849b38e769f6c132db8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f8c23a5f12a52b198dfa8942b9efe2b00bdf1cbe (diff) | |
parent | 304a8d95686a1d48c01f03bbb3e456bb1a0bce35 (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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions