commit | 1f073dcba05631f5200eb8296537d34c92dd768f | [log] [tgz] |
---|---|---|
author | Kris Alder <kalder@google.com> | Wed Jun 17 23:04:20 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 17 23:04:20 2020 +0000 |
tree | acfe740bacd39a0408545c6e53a5ee25331d1ae1 | |
parent | a8277b869760335faf9e56f04732d7929ba04276 [diff] | |
parent | e9ad94d319114da87dc4d42db69d067e898ad6ae [diff] |
Merge changes Iaa3f64f7,I890d2e23 am: 7b86ff3552 am: 798580bf0b am: 7740f0f574 am: 609ae48d7a am: e9ad94d319 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1340014 Change-Id: Ic839f67f3dea33cef2eb36ab9f06628a4a13c7a5