commit | 996c214bbcdc6742a86b6102088a774d2567d5ab | [log] [tgz] |
---|---|---|
author | Kris Alder <kalder@google.com> | Thu Oct 15 23:14:15 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 15 23:14:15 2020 +0000 |
tree | b83b33ddc7b9c5cc165df8890b903ea9afadddd8 | |
parent | 787015d75b79f7e262326b3e8ba5774c46147805 [diff] | |
parent | bf13fc87b0113b274a3ed1f924172fefc12b555e [diff] |
Merge changes I3929bfb6,I4ad6fa07 am: 632056e550 am: bf13fc87b0 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1458126 Change-Id: Ifa926ce9e8580095a9d1738a3c02c88d273ac1b1