diff options
| author | 2022-09-26 03:39:18 +0000 | |
|---|---|---|
| committer | 2022-09-26 03:39:18 +0000 | |
| commit | 0d97ae791b2bcb43eddb94dac01d90b35954434b (patch) | |
| tree | 61869a6f4abf0e49818ec1c1fd128b33f3c30b21 /libs/androidfw/ResourceTimer.cpp | |
| parent | e2bb30d14a65ce288e017f2023af1a0347a3651c (diff) | |
| parent | 5c122444978c06ee9df389d2ce77d23d4f6a4f7a (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761
Change-Id: Ic9e59ee69cd9583113d2066956e5631e53631a2b
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