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