diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-22 08:47:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 08:47:48 +0000 |
| commit | e84d37f1ee73f60536ae31afbaa5912918785be1 (patch) | |
| tree | 0ef840a0b499b00f1b8e7e4ca6d9578f0d9c5c97 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c86e8c344240b9098bbef215422e538c98781066 (diff) | |
| parent | f97faada5d34765600b0a5d1274e1c68f7d79ba9 (diff) | |
Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
am: f97faada5d
Change-Id: Ifba1f49a4411450cbe782fc2a1aded6bb7e4c186
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions