diff options
author | Fyodor Kupolov <fkupolov@google.com> | 2016-07-14 00:15:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-14 00:15:15 +0000 |
commit | a9d12e8fb0445055e19c936d2cb0a4eca84c75c7 (patch) | |
tree | 67b74b9fdca6580f663618cf0dc99cb30df73658 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ff35cb18f5b5917c2bd01376db82d4bc858c5639 (diff) | |
parent | 71d286a45df158c43724470783e2920f0c9b0667 (diff) |
Merge \\"Disallow safe boot when in demo mode\\" into nyc-mr1-dev am: f61eb922f9
am: 71d286a45d
Change-Id: I75374581e5bf4f14eccb581b0895ea204223fa1a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions