diff options
| author | 2022-11-22 03:47:16 +0000 | |
|---|---|---|
| committer | 2022-11-22 03:47:16 +0000 | |
| commit | 1992dff0654430cd3a9fd0f53f47dcced9e0e120 (patch) | |
| tree | 02cdc5769e54bceef498b036ba741285d6217b6b /libs/androidfw/AssetsProvider.cpp | |
| parent | c13b78eda142dda229f89d8be1979c594cba4c1b (diff) | |
| parent | fc0ce8aa00398ba0d90a2b1106671c85f6b2eb40 (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: fc0ce8aa00 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541
Change-Id: I6357a36f89f3b276a9e64c182678487a7a42457c
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