summaryrefslogtreecommitdiff
path: root/libs/androidfw/Util.cpp
diff options
context:
space:
mode:
author Josh Tsuji <tsuji@google.com> 2022-04-11 22:17:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-11 22:17:18 +0000
commitc64b0c2d1dda77ce086f277eb3bfccd893f3bc6f (patch)
tree26743c45598365fc5dab8d4fc2a10240d516a953 /libs/androidfw/Util.cpp
parent9a71badec46d0bbefc20fd4078ac3f1baadf7ee1 (diff)
parentdd0f6b86bc80eb9227b03ec8896afef816471f20 (diff)
Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev am: b39e1f1a67 am: dd0f6b86bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17571000 Change-Id: I1d5aa3a26285b099ddde3921e47260ca26c10220 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/Util.cpp')
0 files changed, 0 insertions, 0 deletions