tree 0cc021aea3a1e3b8bc40faa7e2b9bd94e7d499a5
parent 0e4501c291339fec1dccc1b72297f6acb4bde75f
parent baab496f1f76ec39b0b9a68174904c4a912405db
author Xin Li <delphij@google.com> 1599789779 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789779 +0000

[automerger skipped] Merge Android R am: 337e97fb2c -s ours am: baab496f1f -s ours

am skip reason: Change-Id Idb5917901dd699dbdc62064c113543cabd873ed1 with SHA-1 173ce2b811 is in history

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

Change-Id: Ibe0a837ce38e18db0ab7e1209f900f51b3201bcf