| commit | 974dc0e2e449ca16420517438e0e931471819193 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 08 16:08:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:08:10 2020 +0000 |
| tree | 903a77e29736a83739c2ddd03c423fc8bcb42028 | |
| parent | 344a6065d728c892b2e25b1d1f1b5f9e27016efb [diff] | |
| parent | d6fbd84b0d24e20b21e44202030b134572f72db4 [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: bf76b844cc -s ours am: d6fbd84b0d -s ours am skip reason: Change-Id Iacddb8afef9729cb7096e3247178b87409942437 with SHA-1 4622782c11 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323237 Change-Id: I64319204d7a53c065ce93da97cf9cc94404be7fb