diff options
author | Jim Miller <jaggies@google.com> | 2015-08-06 02:48:51 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 02:48:51 +0000 |
commit | 40fa4070c70d9ddde681b2fb28627b8a4889080e (patch) | |
tree | d427d6a444cb9a5937bd86495074b5155961225f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 25f9f7a482b464b0cfe909ccfb8bda295c9ebc35 (diff) | |
parent | 4a66bbf7fdbd9f96ea4f6d6fe1a63408dd70bd27 (diff) |
am 4a66bbf7: am 5f96eb0c: am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '4a66bbf7fdbd9f96ea4f6d6fe1a63408dd70bd27':
Disable fingerprint when remotely reset by DPM
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions