commit | 656ec9968de9110921bbeea95fc9d1bb3a57a1be | [log] [tgz] |
---|---|---|
author | James Zern <jzern@google.com> | Wed Oct 07 18:24:33 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 18:24:33 2020 +0000 |
tree | 13fc77694f78cc65f5be361d2f8afecbf45ede48 | |
parent | d7381aced23f70862c0449397a76058f1de23ca4 [diff] | |
parent | 8cd9950a30d7123f94f31f64c35a1610843b052a [diff] |
[automerger skipped] resolve merge conflicts of 26957fb8e6b761837a499431d79ffcc7b4be9af4 to rvc-dev am: 4e1c2a54e6 am: 8cd9950a30 -s ours am skip reason: Change-Id I558248e2a0b4cfc4bc3d7c42c80505d82fb9804f with SHA-1 816f15265c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libaom/+/12778800 Change-Id: I17970330c0c953c836c3b33f2418fa1305cbae6b