diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-22 09:01:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 09:01:05 +0000 |
| commit | 370cbc47f3d62f18b3210629ff0d872719b20d9e (patch) | |
| tree | e66fc52406a522b679d5182c7c6751fe46f0a331 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 86803b8a006063a4b7a2abfdaa1872649a55f384 (diff) | |
| parent | 50e2c2cf360e6cad4aa99efb08a51ff8168ef6b4 (diff) | |
Merge \"Block user from setting safe boot setting via adb am: 0ff13fce6f am: 36eb7a1370\" into nyc-mr1-dev-plus-aosp
am: 50e2c2cf36
Change-Id: Idb3e45de97201bf0936724161f8b958397d66629
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions