summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-07-30 04:34:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-30 04:34:22 +0000
commit27b131803267559d540f880142e710444f417602 (patch)
tree0bfb6e5be15cf9695a27f5df7f9e0f8cdd1c700d /tools/aapt2/diff/Diff.cpp
parent31362db006b54056d257cfaaca613e0b79bf85ca (diff)
parentdc2337c1fec29ab7235bfa442e7ece2994293979 (diff)
Merge "Add isFaceAuthEnabledForUser checks in KeyguardLiftController" am: 37053a5737 am: 9b6cf8fde7 am: dc2337c1fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375617 Change-Id: Iaafa4eb81d66f2d9e72bf4bf053cbe041402b93a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions