diff options
author | Alan Viverette <alanv@google.com> | 2016-06-08 18:35:22 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-08 18:35:22 +0000 |
commit | 1bb283131faa7673962027f84c8ab838e194ee5e (patch) | |
tree | bb9f3f542c2280e5e65185fea993f531004e3070 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5431ee2aca37dc938b3336d4deb8f85e16671833 (diff) | |
parent | afaa1e9db1bb76104dab1741e9a80f19050deb16 (diff) |
Merge \"Return correct default theme on API >= 24\" into nyc-dev
am: afaa1e9db1
Change-Id: I620b5682bc4fa9752b1f1bf68d8ed1498db66a5d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions