diff options
| author | 2022-09-26 03:07:57 +0000 | |
|---|---|---|
| committer | 2022-09-26 03:07:57 +0000 | |
| commit | fc27a589ed7abe0d6bb95fe76f75079aac551096 (patch) | |
| tree | 9d5fe5c5dc06bd02cc22301733ff6b7af71dc27b /libs/androidfw/ResourceTimer.cpp | |
| parent | 399b2587b3f5b7913ab9b12fd485cc471737a35e (diff) | |
| parent | 22a5499344adfc4ec16533f97f0131c8941c2ea9 (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: 22a5499344 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: Ib3d7006a0d81bcfadb0c7409a23d7791a562ba5d
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