diff options
| author | 2022-09-26 02:48:34 +0000 | |
|---|---|---|
| committer | 2022-09-26 02:48:34 +0000 | |
| commit | e9c4950de45e486a6929a305f5b9ebee1df137e4 (patch) | |
| tree | 3c220fd3faeae6ef678cc5f78b6e226ff4762c89 /libs/androidfw/LocaleDataTables.cpp | |
| parent | 698077749541354a256973695d688b87ab3fd74f (diff) | |
| parent | 7a3e04b8d609ae3015c35c3057a0f74fbe756cb1 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c879a am: 10166d3457 -s ours am: a47f079f4f -s ours am: 7a3e04b8d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: Iea3006ef305d2321ecaf7cafca41c648cf836a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/LocaleDataTables.cpp')
0 files changed, 0 insertions, 0 deletions