diff options
| author | 2022-10-27 22:06:54 +0000 | |
|---|---|---|
| committer | 2022-10-27 22:06:54 +0000 | |
| commit | fa1d300a6f736e743993f89bc537d9816b7f1202 (patch) | |
| tree | ca3a78b923351a2f4e388e31ffe473bbef3ac089 /libs/androidfw/ResourceTimer.cpp | |
| parent | 65433d99dafaa17f46717cfb0af5bd8adc5e9582 (diff) | |
| parent | 2be2258f1f8f1348fcf126b4772bc3fc2ca3062b (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20251345
Change-Id: If6eed7080be84529bbb6a4e88e2686a664d845a2
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