diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-21 15:27:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 15:27:28 +0000 |
| commit | 662e2a79753eebc39899d4a363096f1cae6c9b43 (patch) | |
| tree | e047ef613d2e1f7e444a7f39404bdbd7b901aa1b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7dbcfcadd557615510e8f1e8003b25f0af724094 (diff) | |
| parent | cb805b35f3dcc96643d340c0a454931875948459 (diff) | |
Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9
am: cb805b35f3 -s ours
Change-Id: Icbc3d0dbcce8e079a895f194c13a5fa35957bc09
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions