diff options
author | Adrian Roos <roosa@google.com> | 2015-08-27 18:24:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 18:24:03 +0000 |
commit | c63a12b78c364a17399ce99f7f74fab8b4b03b38 (patch) | |
tree | 87aa8db7ffcb57b42e1cb9ed6aae53eed2ffc166 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 49ea8298b3c695c208f6887f21f827a825bbff4c (diff) | |
parent | 6fe373b10ef2a2e56745ee2c67588e96f5b8dcad (diff) |
am 6fe373b1: am 16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
* commit '6fe373b10ef2a2e56745ee2c67588e96f5b8dcad':
Prevent Fingerprint when SIM is locked
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions