diff options
| author | 2022-09-26 04:00:37 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:00:37 +0000 | |
| commit | d6e2990a85804d6f2a4ddfc4035cfc55a98540d8 (patch) | |
| tree | a54cfa4e99422af23de246c7bf0bfa2feefce9eb /libs/androidfw/ResourceTimer.cpp | |
| parent | 4ab309b107dd004e1e7ee48adee446cf382fd1f9 (diff) | |
| parent | 0d97ae791b2bcb43eddb94dac01d90b35954434b (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: 5c12244497 -s ours am: 0d97ae791b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: If587e8dd6f7d4be77261d9966a1d1b1f75bfd8dc
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