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