diff options
| author | 2022-10-19 02:59:48 +0000 | |
|---|---|---|
| committer | 2022-10-19 02:59:48 +0000 | |
| commit | 284ea65148ef9bb7b987a8d17fc4a9ce6ef5cd36 (patch) | |
| tree | 49c9333ff2349d70cee053096e2731cd31b5ddc3 /libs/androidfw/StringPool.cpp | |
| parent | e88e45fe03376580ed0ca0d59e65073ccb32079e (diff) | |
| parent | e022b1db24d35e011894ca3071f22b55e933dc13 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-qpr-dev am: fec4943a78 -s ours am: 6c3388db3b -s ours am: 898ea3069d -s ours am: c3e202e52a -s ours am: 2fabff2d82 -s ours am: 1f93cdf8ba -s ours am: e022b1db24 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226237
Change-Id: Ib6b29b171745bbad3ff54d66101b28ad2897fecb
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