diff options
| author | Benjamin Franz <bfranz@google.com> | 2016-07-22 08:47:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-22 08:47:37 +0000 |
| commit | 6b69f6597ed1808dee82cc0036a865315e553d0c (patch) | |
| tree | c0c70a71215e146cccbf41693b10c4be4fa7b58b /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 36eb7a13709073111e2397c9f542cb6f64f3f2b9 (diff) | |
| parent | f97faada5d34765600b0a5d1274e1c68f7d79ba9 (diff) | |
Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
am: f97faada5d
Change-Id: I8f2fad8933d62c0424632c7fcd5e158aa1b0d4bf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions