summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Jiaming Liu <jiamingliu@google.com> 2023-09-08 23:12:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-08 23:12:25 +0000
commit70d1ad89cb722ab76a951810a40786bdc3d3dd3b (patch)
treee2fc1761aec6463025c99fecfce9c729b6db6fcf /libs/androidfw/StringPool.cpp
parented5f85565be941719f190fa8446fe026486b017a (diff)
parentab899cc6c500b9b05362183d9c7d9c26af1a5108 (diff)
[automerger skipped] Merge "Use rotation from WindowConfiguration to rotate FoldingFeature to avoid race condition" into udc-qpr-dev am: b21710e194 am: ab899cc6c5 -s ours
am skip reason: Merged-In Iedb1365d97bcfe14643199a4000472aadeee8282 with SHA-1 6867926666 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24673642 Change-Id: If930f2cc825001af6f880d2b457b937c17514543 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions