diff options
| author | 2022-09-26 02:53:12 +0000 | |
|---|---|---|
| committer | 2022-09-26 02:53:12 +0000 | |
| commit | 22a5499344adfc4ec16533f97f0131c8941c2ea9 (patch) | |
| tree | a54cfa4e99422af23de246c7bf0bfa2feefce9eb /libs/androidfw/ResourceTimer.cpp | |
| parent | 295f468f375d45f94a62266524ab6475b6a2ea0d (diff) | |
| parent | 7a3e04b8d609ae3015c35c3057a0f74fbe756cb1 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into sc-dev am: 0c000c879a am: 10166d3457 -s ours am: a47f079f4f -s ours am: 7a3e04b8d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: Ifc770cb66fabcf022da9156db08690a214ad9aba
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