diff options
| author | 2022-09-26 04:18:59 +0000 | |
|---|---|---|
| committer | 2022-09-26 04:18:59 +0000 | |
| commit | ef8e3203a88faa5690eae459a83ba422729c8d25 (patch) | |
| tree | 9d5fe5c5dc06bd02cc22301733ff6b7af71dc27b /libs/androidfw/ResourceTimer.cpp | |
| parent | 62da72d873f82d61a84d1640c5f0fe2a9e60eb5d (diff) | |
| parent | d6e2990a85804d6f2a4ddfc4035cfc55a98540d8 (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: d6e2990a85 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: I2dce2d6325b97a67bdff4baf58e136b441f020cd
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