diff options
| author | Adrian Roos <roosa@google.com> | 2017-09-05 18:16:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-05 18:16:17 +0000 |
| commit | dc70defa05a3a5e7b91e8e8b8a2ce22db48455ef (patch) | |
| tree | 1393d505ef02c129940e220295648b496b82eb54 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | e6a5f1c9d6160423424d2bc9e25558de0a6da302 (diff) | |
| parent | b0d617a64391a61af06c999df0f77e43ef615880 (diff) | |
Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev
am: b0d617a643
Change-Id: I14027f7967a0c4de691110b6a96ae46ea6424ca5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions