diff options
author | Suprabh Shukla <suprabh@google.com> | 2016-07-13 20:27:46 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 20:27:46 +0000 |
commit | d940c86d954e395c2f4e9e0faebfecb931f86799 (patch) | |
tree | 455f9734baf05aaf46b990e1cf79734f40532557 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a74fce83ae729dc8b0afdfb90e5557370b5ee5ff (diff) | |
parent | 0ce03e77bc58cccb083ec0d98bb1516db6a1523e (diff) |
Merge \"Disallowing bluetooth config for demo users\" into nyc-mr1-dev
am: 0ce03e77bc
Change-Id: I89d396d0450c241fc1314cd8320ed2c6d02b9823
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions