tree 85a62af486e9af44345b062aab77e4dbf6fd16b5
parent ee659e942b879151f6a289d4e3dcb7e6961c4586
parent bc3ef1e87a557aead2edf874172175ff794a093f
author Xin Li <delphij@google.com> 1598587966 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598587966 +0000

[automerger skipped] Skip Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e251a4002a -s ours am: 48cd541842 -s ours am: bc3ef1e87a -s ours

am skip reason: Change-Id I5345611ee80665b3e59f1f17b6040fde18e19f3e with SHA-1 60b8443ff2 is in history

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

Change-Id: Ief55ed3833a8bf0444b35b1b95065b71ac6d2a5e