summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-14 19:20:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-14 19:20:39 +0000
commit90260b6f9baea2de54cbac19b41c9ebb610e65c6 (patch)
treec3cf2cd8a3cf4ef1084047a24a92e8c1ccd7827e /libs/androidfw/StringPool.cpp
parent846e6d92f07f55b94d33d55bb4391e14f89ca19c (diff)
parent39d799e93bda6aaa0ad64472075a7d50e67d8458 (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1daa90f3ed -s ours am: 058f043b9e -s ours am: 78a669f6d3 -s ours" into sc-v2-dev-plus-aosp am: 39d799e93b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16637227 Change-Id: I0d48b9b7523b605564a79417e5a97844526bb922
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions