| commit | ab94c0da395138a7cef36e4dee83f99bfde0d082 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 08 17:25:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 17:25:15 2020 +0000 |
| tree | 6dacd7fbb5bb0c6dcc34be613ee507a318cc2842 | |
| parent | e5c44c76ee67d62a8da8df367986dc5269a23aee [diff] | |
| parent | 4819ab368f145358c6927c647764cef8496e6fdb [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: bf76b844cc -s ours am: d6fbd84b0d -s ours am: 974dc0e2e4 -s ours am: 212849583c -s ours am: 4819ab368f -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: I1e709791e34b042f253fc8a983b439c682169e10