diff options
| author | 2022-09-26 03:06:16 +0000 | |
|---|---|---|
| committer | 2022-09-26 03:06:16 +0000 | |
| commit | 3b7929f2988bf6c422acaa907ea099b10946c78d (patch) | |
| tree | 39fcb580f3fad7e5a6794701969127630ad7e5ae /libs/androidfw/ResourceTimer.cpp | |
| parent | 56583f05c028e544e52801f9c42e6bd4d6cdd2e0 (diff) | |
| parent | 7de60a54671a81b1d8e93fce890dc6dbdeef9b64 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I89b8bbd1654553023deecc75b6e4eca56d4717f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions