summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-09-26 02:53:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 02:53:03 +0000
commit61ef79fa5ef56872998b477cf7b0a4f1f487bcd6 (patch)
treea54cfa4e99422af23de246c7bf0bfa2feefce9eb /libs/androidfw/ResourceTimer.cpp
parent0460042adb9391e4cd7d4ced1302bf59328b1462 (diff)
parenta2c1b0bb8fb4083a02ec6aa49a2ac67e1be93bd4 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706 Change-Id: Ia24e11c0a92a5ee038648be5e4725faa38df143a 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