diff options
| author | 2022-09-26 03:07:25 +0000 | |
|---|---|---|
| committer | 2022-09-26 03:07:25 +0000 | |
| commit | 24edf13f41e68721565c8ec38297fb0a9b050ac7 (patch) | |
| tree | 9d5fe5c5dc06bd02cc22301733ff6b7af71dc27b /libs/androidfw/ResourceTimer.cpp | |
| parent | a78ee96de15f639c623d6fd78d0a4c118e07ecf5 (diff) | |
| parent | 61ef79fa5ef56872998b477cf7b0a4f1f487bcd6 (diff) | |
[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f am: c30420a5cf -s ours am: 8e944c7e5d -s ours am: a2c1b0bb8f -s ours am: 61ef79fa5e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: Ica369537ddf2029c1f8ce1f9f2d83b5a6025c9e3
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