tree a584d2288d20f844a8e8ff89c875dbf7ce5278af
parent d83a22fd2f6f3808e0a0aaaee8bb1c972d1abe8a
parent 647686ecbe357f97b0382b1b48c4d65b02dd4fac
author Xin Li <delphij@google.com> 1598998217 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998217 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 4d17d097be -s ours am: 494447b1e5 -s ours am: 647686ecbe -s ours

am skip reason: Change-Id I14d7f590626ed952689da92e72b4f0be8fff752f with SHA-1 658fa7f244 is in history

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

Change-Id: Ib52ac3bd1d13c5011946a8a82329fb321bb010d3