diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-22 08:54:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 08:54:24 +0000 |
| commit | 54255611e417ce5e5292abd6aa192b61c0321ca7 (patch) | |
| tree | 0ad93d87a2e709e9dfd9dc121bebfe377977ee97 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 428b3bdca87a1483dfe5fedc548a6365f3b2e328 (diff) | |
| parent | e84d37f1ee73f60536ae31afbaa5912918785be1 (diff) | |
Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am: f97faada5d
am: e84d37f1ee
Change-Id: Iecce325f92455edfac8065a843dacf2f938bb560
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions