diff options
| author | 2022-10-27 23:12:13 +0000 | |
|---|---|---|
| committer | 2022-10-27 23:12:13 +0000 | |
| commit | 6943034e955cf4d51cc1cf62fc16b55a2975fa68 (patch) | |
| tree | 901e31e53c8ad732ec4f358c007722630732ab9e /libs/androidfw/ResourceTimer.cpp | |
| parent | 954eabeaf56f7e1b0ce04deef4b1a7e2121e7199 (diff) | |
| parent | eaf8ac534cb7b6943d00674905cfba058af959d0 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE][SettingsProvider] key size limit for mutating settings" into qt-dev am: 14a5113c31 am: f36b827848 -s ours am: 4bdc2cd139 -s ours am: 857d4f2a48 -s ours am: 434c64ff6d -s ours am: eee2531e7e -s ours am: c16c4bb875 -s ours am: 2be2258f1f -s ours am: e39d6113a5 -s ours am: eaf8ac534c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20251345
Change-Id: I2c73e6e12f8c0956146e4a7ccf16b6e7c3238875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions