| commit | ea0c349564bf4a8add37df157fdb3ac872d89fa6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Dec 07 21:10:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 07 21:10:25 2020 +0000 |
| tree | 1fa9596ae1b6a5dcc9e6061241add861829ca7bf | |
| parent | 4fd62e7686531e505844084e39130f119bd59aa9 [diff] | |
| parent | 142100a49ef2ad00dafac043e6c066295ad716b7 [diff] |
[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: d0cc5ece35 -s ours am: 142100a49e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13176631 Change-Id: Ib5f9eb248449eea517cf6387f8e610a918aae253