| commit | 798580bf0b26923bbcfc659cbbd5c2e49b188c99 | [log] [tgz] |
|---|---|---|
| author | Kris Alder <kalder@google.com> | Wed Jun 17 22:04:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 17 22:04:33 2020 +0000 |
| tree | 41a5e22e04e1be96f3e813ab60a6722f2bf72326 | |
| parent | 1e1bc0abfa2bad37f26ab028cc1391d908e09e6f [diff] | |
| parent | 7b86ff35529f0cd1ea8b58d4237385ebf361d641 [diff] |
Merge changes Iaa3f64f7,I890d2e23 am: 7b86ff3552 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1340014 Change-Id: If7ccfd8fdb54707a8c48afb21c187b5129f9103f