diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-22 02:13:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 02:13:07 +0000 |
| commit | 378b7d1f3942917cc6980a83d07c76589a77acf5 (patch) | |
| tree | 252493413c953b4bbb3f663198d322e4fc3c260c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a043fce41d28aefb37f87a8e279f99b8e91ee8df (diff) | |
| parent | 0eadbe6d369844485d36e45f2b4ca9770828ae52 (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: 0eadbe6d36
Change-Id: I44f878a88710950bdee31c326c6b3b465999e7c4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions