diff options
| author | 2022-11-22 04:23:52 +0000 | |
|---|---|---|
| committer | 2022-11-22 04:23:52 +0000 | |
| commit | ab775cc6467690741db7909a1c18d3499f96330e (patch) | |
| tree | 6252e1f7a3ef1b83d3be21091cb447b62aa12499 /libs/androidfw/AssetsProvider.cpp | |
| parent | 87cd672b7d4b4c1b4742d6c7fd1fd378286c3347 (diff) | |
| parent | 1992dff0654430cd3a9fd0f53f47dcced9e0e120 (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: 1992dff065 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541
Change-Id: Icf943a492880d82eba31c4d1e5f02351ac442ef7
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