commit | d6fbd84b0d24e20b21e44202030b134572f72db4 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 15:56:56 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 15:56:56 2020 +0000 |
tree | 2a0182f470592170ef54b8dd235eda4f292abaf2 | |
parent | 0d6306380520c98ac96ca4150b9154b31d0377d3 [diff] | |
parent | bf76b844cc2b4926dfd1f74924da9e51cb6c5147 [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: bf76b844cc -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: Id507517c3dd6e2bc1bd57eed0fefb46ed338c1c9