diff options
| author | 2022-11-22 03:22:55 +0000 | |
|---|---|---|
| committer | 2022-11-22 03:22:55 +0000 | |
| commit | fc0ce8aa00398ba0d90a2b1106671c85f6b2eb40 (patch) | |
| tree | eaee547109a8dbd775d77ff17e6c46404e02bbfa /libs/androidfw/ConfigDescription.cpp | |
| parent | 59d1c8f546d3c87532442c5a72011e383efbcc9b (diff) | |
| parent | 741be155f2225e5c826a70461571d36604db35ec (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-v2-dev am: 172f1c303c -s ours am: a302649a72 -s ours am: 741be155f2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541
Change-Id: Iabbe536936629f154b3530bb8cb84508fc75d89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions