diff options
author | Adrian Roos <roosa@google.com> | 2017-09-05 18:26:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-05 18:26:48 +0000 |
commit | 55828dd06d63e75b1f98f2c7ed150dd7b7fec78a (patch) | |
tree | e72b0011125fbf75a09160e9703ad279b5b25bad /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c083f81cd03d95469a28d189433abfca9dd17023 (diff) | |
parent | dc70defa05a3a5e7b91e8e8b8a2ce22db48455ef (diff) |
Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev am: b0d617a643
am: dc70defa05
Change-Id: I6477e57f61eb3b80795b8eed273d3a123b382699
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions