| commit | ae70e94c083208396cd5c8bf609ae8013156792d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 08 16:29:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:29:12 2020 +0000 |
| tree | e970ad106b5a5b3a05b0131294fde8873994facb | |
| parent | 0997f386223d31f78a9dc268ef65e182391c5d9b [diff] | |
| parent | 23442489fbd55fcf76efa90d264d74677eda07a6 [diff] |
[automerger skipped] Merge QQ3A.200605.002 into master am: 41abcf9aeb -s ours am: d7cb857a4e -s ours am: 23442489fb -s ours am skip reason: Change-Id I719a82627239e6bbe937752622ddb209a8720772 with SHA-1 b8f0dc9bb4 is in history Original change: https://android-review.googlesource.com/c/platform/external/libmpeg2/+/1323309 Change-Id: I310b4bb2a0b28eb30f8e310c948456692621b7d4