summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-03-22 03:48:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-22 03:48:30 +0000
commitbc84ba38629846353fc177b1200ceb46ceaa3559 (patch)
tree6ef208ba04d3d0c31a648188e8a1f4616561a5a0 /libs/androidfw/FileStream.cpp
parent1dfadd8ca0d83899f4e6a75f39a4bf79f2673829 (diff)
parent4436ac28f320dfdf758ae8880b2c30fef4b88c1c (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: 4436ac28f3 -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: Iad327cf764f74d882d256783880ac3a33aba3969 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions