summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2022-10-19 03:33:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-19 03:33:49 +0000
commit80c2a8e1ceb8701a2b3afc4fd3407c61c02045cb (patch)
tree4fb06f07021beedba457bc2e75bc4df532a7084a /libs/androidfw/StringPool.cpp
parentbaca8018893c4ed335528dedde314e22a836763b (diff)
parent0a73eecb876f2f424a79e708456f8b9307470ee7 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-dev am: 43c9711338 -s ours am: 0955d92a0f -s ours am: 9316713ba4 -s ours am: 38ea9c71c0 -s ours am: d5033d9891 -s ours am: cec951432d -s ours am: 28df77b28d -s ours am: 4d80e6f409 -s ours am: 0a73eecb87 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226472 Change-Id: Ie112dfb676d1d5cd4589c75f7211663d8471f044 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