tree 9483f8d2eda71fb6798b04bdb1308f9b5651f2e4
parent 2924162a55f59d6a15fd0251716178283c3cc8d1
parent 60c730b6d98f1721a9e078b209a6e15080d6ce0f
author Riddle Hsu <riddlehsu@google.com> 1594109200 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594109200 +0000

[automerger skipped] Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313c9 am: 60c730b6d9 -s ours

am skip reason: Change-Id I2f979055e89ae5e40af05e469741bb89e2e24ce6 with SHA-1 29bfa72754 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12085171

Change-Id: I2a3f8997de9d9087a72914c0e82955829c24fe0f