tree 80112088e775b4bb7583e46c5bf274accbca5c68
parent 0b69784061364fd84fc569bfe1c792bff2399500
parent d1b1144541311feff0360749a1db5bc6079b7986
author Xin Li <delphij@google.com> 1599784833 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784833 +0000

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

am skip reason: Change-Id I2cdcc262de85c00bf4c8f014dfde4c73e3e8d72a with SHA-1 0b69784061 is in history

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/1422303

Change-Id: Ibb28039c4f88173a6b843a0e265f88c405ac966a