diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-22 09:00:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 09:00:49 +0000 |
| commit | 3ee2526e535f2bc73dcb3599a8cff22875f38355 (patch) | |
| tree | e66fc52406a522b679d5182c7c6751fe46f0a331 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1dc06e0aff3cedd54014822828214c4a473fbe59 (diff) | |
| parent | 54255611e417ce5e5292abd6aa192b61c0321ca7 (diff) | |
Merge \\\"Block user from setting safe boot setting via adb\\\" into nyc-dev am: f97faada5d am: e84d37f1ee
am: 54255611e4
Change-Id: Iadf0c57ec6c47787568ea6cb61bee429b2b13f66
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions