diff options
| author | 2022-09-26 02:29:19 +0000 | |
|---|---|---|
| committer | 2022-09-26 02:29:19 +0000 | |
| commit | a2c1b0bb8fb4083a02ec6aa49a2ac67e1be93bd4 (patch) | |
| tree | 61869a6f4abf0e49818ec1c1fd128b33f3c30b21 /libs/androidfw/ResourceTimer.cpp | |
| parent | 7ef756cc75752e1b428bc11c4d07c66f0ea3a9c9 (diff) | |
| parent | 8e944c7e5d18501bc697a4f968e74f9a8d92e8fa (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706
Change-Id: Icbd441e101a030ae3f119749ea752373eb7a43cc
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