diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-21 15:57:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 15:57:21 +0000 |
| commit | bbd1a113e872981ff4ae7d3cb06b5442504e8bc1 (patch) | |
| tree | 52f8647aadd0412dfe98b6c5f3ad055c8dda0d01 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a276b1bdcd1bce88e4427b12cfb8e325baa384e7 (diff) | |
| parent | 1ca903022c3e8892ab09261de9bf752c24e588ef (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 am: 662e2a7975 am: 461309a63a
am: 1ca903022c -s ours
Change-Id: Ia7b3c9756c7224ac38c028d9018813442fe02436
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions