summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-04-11 17:02:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-11 17:02:00 +0000
commit87646514be50390c251e00e21b31b32f2eb10f1c (patch)
tree24d67a171d5501303a4adbee298fe9eb8f5eb0fc /tools/aapt2/diff/Diff.cpp
parent6f14dc95cfb5fcbacf29afc51c9d425518fe09d6 (diff)
parent77ef9fc91bb0086421ef2b45681982807d83a549 (diff)
Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions