tree 33f4e5900bba51ec18cd919936b40581b0bab33c
parent cbf46917afc540fda02b8ea60db863a2666cc8aa
parent e3418ae93ee0a070ea1b25b82995d14b7a53a3ed
author Xin Li <delphij@google.com> 1599784843 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784843 +0000

[automerger skipped] Merge Android R am: e3418ae93e -s ours

am skip reason: Change-Id Ibe2b21465c2e62400f72bbb488944a7a641a91ee with SHA-1 cbf46917af is in history

Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/1422344

Change-Id: I74d7c08e82377492b5f6f387bcbe3628ed55f3cf