summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-03-22 02:50:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-22 02:50:55 +0000
commit4436ac28f320dfdf758ae8880b2c30fef4b88c1c (patch)
treecefa4c5875c1c45f3cdf198020a8603d40f76e62 /libs/androidfw/ApkParsing.cpp
parentef31385978c2b4bcb959e0730e5a043fd85d61ad (diff)
parent63ff1ff1cc06082b7779aa2c00bd069c6386709f (diff)
[automerger skipped] Merge "Change the wait time of setDefaultLauncher from 20s to 60s" into android13-tests-dev am: 47dd6d7279 -s ours am: 63ff1ff1cc -s ours
am skip reason: Merged-In Iab78a57d4329095358cad6e79088909b48a22264 with SHA-1 391aaf65c5 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2455828 Change-Id: Ie034d7d3a0569df2c7159f70efcbbd4d6f25d2fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions