diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-21 10:10:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 10:10:03 +0000 |
| commit | 87534f4ac95ab481ca682ef34a7b6ee7767bbb3b (patch) | |
| tree | 7f008b8c74164aecb58df89fa11ecb1360817c39 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2331eefef72c07f4f6dcf1f96eaa774034988ef4 (diff) | |
| parent | 7abd7ba0932e882a8c4cea87a79de3e05c8451af (diff) | |
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3
am: 7abd7ba093
Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions