diff options
| author | 2022-09-26 03:25:04 +0000 | |
|---|---|---|
| committer | 2022-09-26 03:25:04 +0000 | |
| commit | 5c122444978c06ee9df389d2ce77d23d4f6a4f7a (patch) | |
| tree | b900c001dc1fbfea978219dd569a5f865c7fde3c /libs/androidfw/PathUtils.cpp | |
| parent | 3a243d920b3057b99acc51f25ce6b2a3125b9adc (diff) | |
| parent | b482a00d3c62f14b89af4aa9dbd0289acd8dffb9 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours am: 7de60a5467 -s ours am: b482a00d3c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I644dbb2c6ddab332195af71ce55ee03cc6839c26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/PathUtils.cpp')
0 files changed, 0 insertions, 0 deletions