| commit | 3a76c176ea9d8896142d87fb5b0497684a4a1ab5 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Tue Feb 23 22:51:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 22:51:17 2021 +0000 |
| tree | abde07308027227afc3c2cf4e5376501e69ba628 | |
| parent | 2284baeb7d0a7e35a82c2fb91df0d10a1d719d7d [diff] | |
| parent | d5a3fb2900ddbbe150eae43916f93a5a2688fec8 [diff] |
[automerger skipped] Merge changes I0aa848bb,If81dd3c1,Ib03bde00,I1ae58c7f am: 7327aab894 am: 562c924793 am: d5a3fb2900 -s ours am skip reason: Change-Id I0aa848bb75c0db1821c5a40577c5ca90984753e7 with SHA-1 cd2f75857f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1591122 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72210e5f0409cc9307eeffa8800c94125fb024d3