summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-03-22 14:06:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-22 14:06:14 +0000
commit64444077e8ac2cf72ebf2343ee38ff9ab93a6b95 (patch)
treecbd58b2c60e1bbc872f84d1f013d8f204026b292 /libs/androidfw/ResourceTimer.cpp
parent865f6386c0569e1efda4258f18f082f39fd3672f (diff)
parentba4d1a41617ee1476225ad248e79043a3351a733 (diff)
[automerger skipped] Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into android13-tests-dev am: 47dd6d7279 am: 26e6bddfbc am: 3529942a1b am: ee8be1b461 -s ours am: ba4d1a4161 -s ours
am skip reason: Merged-In Iab78a57d4329095358cad6e79088909b48a22264 with SHA-1 4df0bbaf93 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2455828 Change-Id: Ie555231b7e53a722a96dda42a1768a30df4340b7 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