summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Rubin Xu <rubinxu@google.com> 2024-07-16 12:43:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-07-16 12:43:33 +0000
commit50c2d1c077be2d91229ae01cb1094191ba38a539 (patch)
tree946cbb09c387b2c20dd25c3a946e0fd094778689 /libs/androidfw/StringPool.cpp
parenta6db7346cb684df150a9d8f76748b3985b94b1bf (diff)
parentcce61395e1e24cc8d003cbdc90bec6b936b8014b (diff)
Merge "Set timeout for binding service to avoid thread blocking" into main am: cce61395e1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3170019 Change-Id: I4fbc3c18d3d8c3901ff5d19074e9d7575dc2866c 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