diff options
| author | 2022-10-27 18:27:57 +0000 | |
|---|---|---|
| committer | 2022-10-27 18:27:57 +0000 | |
| commit | c1e5bfae9e1709d776f916adba2e5c8df2955c5b (patch) | |
| tree | 5905e7ad7b20187e4df41e5ec158970a362e979c /tools/aapt2/SdkConstants.cpp | |
| parent | 96b576e32fae04f64d9168d74d2f505daa17ff72 (diff) | |
| parent | 8460fdcc810a7644449872a337b4e3a352092b11 (diff) | |
[automerger skipped] Merge changes from topic "settingsprovider_keylimit-sc-dev" into sc-qpr1-dev am: ff672cd789 -s ours am: fbde17b949 -s ours am: 9b8d766775 -s ours am: 9006e2b976 -s ours am: 8460fdcc81 -s ours
am skip reason: Merged-In Ic9e88c0cc3d7206c64ba5b5c7d15b50d1ffc9adc with SHA-1 75c1d6096c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20250994
Change-Id: I88b073323b3e4978ccde7ae7bb392feea0954784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/SdkConstants.cpp')
0 files changed, 0 insertions, 0 deletions