diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-19 01:31:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 01:31:58 +0000 |
| commit | 309fef16e1494c80a54cbd0a59a98f32c512f845 (patch) | |
| tree | 3be27c35ca505cf01eb1a4a89c0c76c0b5b97706 /tools/aapt2/diff/Diff.cpp | |
| parent | 458d4d6d7fa8d4e76674a32c240bdbd7701a86dc (diff) | |
| parent | e11fbc08a340cb069c8034b7ffd794c32344d4ba (diff) | |
am e11fbc08: am 33a5c807: resolved conflicts for merge of 448216e7 to mnc-dr-dev
* commit 'e11fbc08a340cb069c8034b7ffd794c32344d4ba':
Revert "Disable fingerprint when remotely reset by DPM"
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions