| commit | a9296e85ce8afad25b65f2dd54f16d7318b0de1d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Nov 11 21:36:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 11 21:36:41 2020 +0000 |
| tree | f8e40c88d191fe9eb0915d871782cb34258d7217 | |
| parent | 75ea85a721355a827aba84e4f2cdad78512ca9fe [diff] | |
| parent | ee16990a52e3d595ccf882d023697497aef3955a [diff] |
[automerger skipped] Merge changes If34bd5eb,Ib373b71b am: 9ef57e41e9 am: becb9aa8bd am: 3206948247 -s ours am: ee16990a52 -s ours am skip reason: Change-Id If34bd5eba1498f081d613d2ebc15ff75f2a90f2f with SHA-1 1df51f3fa6 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1478017 Change-Id: I58e9e6f3c77fff0e4ee2c0506d4857b94aedd401