diff options
| author | 2022-11-22 03:22:22 +0000 | |
|---|---|---|
| committer | 2022-11-22 03:22:22 +0000 | |
| commit | 4c47125d4f0de15d0285e05047a8ebeb7c00fb4a (patch) | |
| tree | d9110a680bb8b974db8e0a92fe7b685035b327d3 /libs/androidfw/AssetsProvider.cpp | |
| parent | b86f5cd6d980532b71849aaa1dde08b90aa542fd (diff) | |
| parent | 06d3a3830fa26f1ae132e2094b6a57c646914a2a (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: 06d3a3830f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541
Change-Id: I9ea98c53b9ce15f804db90e19990562f7547b848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions