diff options
author | Ivan Podogov <ginkage@google.com> | 2017-01-03 14:13:03 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-03 14:13:03 +0000 |
commit | f297340b61987b00daf7c26ebf24911919249d75 (patch) | |
tree | 8ba989034e4d5fe8fc2e05438cb2f4ac3e22a25d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a01a471d4f3b786fdf3b6afe0cd45d93dd1f1822 (diff) | |
parent | 03b1d5208883dca4c0ac906d9ec6ac1537ef3e00 (diff) |
Merge "In permission review mode, always request user's consent to toggle BT. am: d2d32b1f32 am: 0368be4523" into nyc-mr2-dev-plus-aosp
am: 03b1d52088
Change-Id: I7ba648d4df507ccdc69cbf9e2387f9825d650621
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions