summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceParser.cpp
diff options
context:
space:
mode:
author Beverly Tai <beverlyt@google.com> 2022-10-12 20:09:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-12 20:09:41 +0000
commitf48e967738876eebb5382fc4616fa64bde5ac647 (patch)
treeacf093f0209ba717c215b6f6e264bfb5d7ea928c /tools/aapt2/ResourceParser.cpp
parent2964d14212cfb6f18b3e1edeff8795fb9d29afc7 (diff)
parent04821a899027a8b3a0250cfcb4dd4bf44023ae49 (diff)
Merge "DO NOT MERGE Use KeyguardStateController for #isShowing" into tm-qpr-dev am: 04821a8990
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20024905 Change-Id: Ie041cdd741dc89c4be08851cf65b053339f227f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions