| commit | 609ae48d7ac138cc88137c4a5ac563217e3b14b4 | [log] [tgz] |
|---|---|---|
| author | Kris Alder <kalder@google.com> | Wed Jun 17 22:35:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 17 22:35:15 2020 +0000 |
| tree | c595da324d498a49b0a9ef2391c70fd043396ee5 | |
| parent | ec407509b5bb31a8283a130de8235233d7f3aa3f [diff] | |
| parent | 7740f0f5741cd66797118a856482d47714b91364 [diff] |
Merge changes Iaa3f64f7,I890d2e23 am: 7b86ff3552 am: 798580bf0b am: 7740f0f574 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1340014 Change-Id: I683ddebe573dd0c7b6b537879a0a9db12f0bb2a5