summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2017-01-23 22:21:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-01-23 22:21:07 +0000
commit5304e89dfd41dd45cab0abd703ebce05d870d506 (patch)
treed4394fc07abe70561ce45bb25c58ee7f6579c14e /tools/aapt2/diff/Diff.cpp
parent2536cc6872ecdc43d7e9b07a02fbc844e5f124bb (diff)
parent0b1853f997e175dc9cf4b93088f63b774f05253f (diff)
Merge "KeyguardManager: Fix user resolution of isDeviceSecure/Locked"
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions