| commit | 8f83fba2fae27ede6cf9d9a19b4783cc9337df38 | [log] [tgz] |
|---|---|---|
| author | James Zern <jzern@google.com> | Thu Sep 05 20:19:38 2019 -0700 |
| committer | James Zern <jzern@google.com> | Thu Sep 05 20:19:38 2019 -0700 |
| tree | 31ca45c869b667c4dfca215aa50c2c5164c406f7 | |
| parent | 751e6a37fe91a1c78a9eaee394f8c3503c3f536f [diff] |
resolve merge conflicts of 76df1b46e37da4d493e041522c407b459823e718 to master (2) update stagefright xml files to reference the correct av1 codec id, missed in: 90a850acc8 resolve merge conflicts of 76df1b46e37da4d493e041522c407b459823e718 to master Test: plays av1 video Bug: None Change-Id: Ie9465fdb61920aad67cff4f8d02b137c441a5c03