diff options
| author | 2022-09-26 04:18:45 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:18:45 +0000 | |
| commit | 62da72d873f82d61a84d1640c5f0fe2a9e60eb5d (patch) | |
| tree | 9d5fe5c5dc06bd02cc22301733ff6b7af71dc27b /libs/androidfw/ResourceTimer.cpp | |
| parent | fc27a589ed7abe0d6bb95fe76f75079aac551096 (diff) | |
| parent | 4ab309b107dd004e1e7ee48adee446cf382fd1f9 (diff) | |
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 7da08c6bd3 am: ef00451cc5 -s ours am: 42815bea3f -s ours am: 3e91dc1fb9 -s ours am: 3a243d920b -s ours am: e2bb30d14a -s ours am: 4ab309b107 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I53f148b7a2acd21fc260433f6a0832f5651368e2
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