diff options
| author | 2022-08-10 02:15:39 +0000 | |
|---|---|---|
| committer | 2022-08-10 02:15:39 +0000 | |
| commit | 46e39c4842d61e114dad9e33f51b7a97ce7514b3 (patch) | |
| tree | 3cf3b65efa452b37a04465a8862fd5b21b85d850 /tools/aapt2/ResourceValues.cpp | |
| parent | dfe9c6de6b626942511f918b33544899a0d65411 (diff) | |
| parent | 18b177e86f377bdd90b444580117dea361634aaa (diff) | |
Merge "[automerger skipped] Merge changes from topic "cherrypick-TelecomSwitchToParceledListSlice-4t4tlydm2u" into sc-qpr1-dev am: cbe7773d85 am: 2286cc8341 -s ours am: 1734762e27 -s ours am: 8c2d0f6e2a -s ours" into tm-d1-dev-plus-aosp am: 71e463bf0a -s ours am: 18b177e86f -s ours
am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f42a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19369770
Change-Id: Ie4386a285a745779684dd8f1a7014172a91aace1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceValues.cpp')
0 files changed, 0 insertions, 0 deletions