commit | d62f45b26b01742cf958f6136b963b1a2c2248be | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:19 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:19 2020 +0000 |
tree | 3b9ea34febf4940d7caef5418d9eb742d56b97c1 | |
parent | 0b0b5630cc868061665b9e5daaefeee9163d9aa9 [diff] | |
parent | 6cbd0b2da7bbf2f10e66e65c5e5561c0f4b0ad92 [diff] |
[automerger skipped] Merge Android R am: b4eab38de6 -s ours am: 4f0d5891f1 -s ours am: 42318db5e9 -s ours am: 6cbd0b2da7 -s ours am skip reason: Change-Id I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d with SHA-1 6da222fc09 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1422441 Change-Id: I0e5a92d270717a28c036699ed8121605dd206754