diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-22 09:01:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 09:01:36 +0000 |
| commit | 7b59930f3ad564ea4a14e2ffb912368ee8139620 (patch) | |
| tree | e66fc52406a522b679d5182c7c6751fe46f0a331 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5c6d603134c513d576393565e3e39717c5b863bb (diff) | |
| parent | 2b74cb0fca7ba8ed4adc275af40e146280b76baa (diff) | |
Merge \"Merge \\\"Block user from setting safe boot setting via adb\\\" into nyc-dev am: f97faada5d am: 6b69f6597e\" into nyc-mr1-dev-plus-aosp
am: 2b74cb0fca
Change-Id: I064088228c8469d9cecebe0049513916697a2321
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions