tree 0cc021aea3a1e3b8bc40faa7e2b9bd94e7d499a5
parent 3252476f31b2abf9e0ed1f58bcc0c3ee10e0ed9e
parent 748ae97b66a584921af7481ee0f037f315f15bb0
author Xin Li <delphij@google.com> 1602213927 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602213927 +0000

[automerger skipped] Skip ab/6749736 in stage. am: 03c46670f7 -s ours am: 171df8dfe0 -s ours am: 748ae97b66 -s ours

am skip reason: Change-Id I456c8d06c43d9eae43f995a7ec315627771c9c0c with SHA-1 4c5bd1c865 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/12796859

Change-Id: I2ca569abfc11ed7956bb262889b2eaca8ef3a168