summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-08-06 03:03:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-06 03:03:27 +0000
commit4f50d59580983c90accfc3bfff1930a81fecbdfd (patch)
treefd03295055a4189381421583f5c1bc22b8f6217e /tools/aapt2/diff/Diff.cpp
parent04f0524aa17ae1c010f3b327dd49f5164ba8d5ad (diff)
parent40fa4070c70d9ddde681b2fb28627b8a4889080e (diff)
am 40fa4070: am 4a66bbf7: am 5f96eb0c: am 6fdb85d3: am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev
* commit '40fa4070c70d9ddde681b2fb28627b8a4889080e': Disable fingerprint when remotely reset by DPM
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions