commit | f340ef635cb522befd3f30e31fccee1d7b958c83 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:36 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:36 2020 +0000 |
tree | 105740fbb3b59823bddfaae294f7bb7b300ffdb7 | |
parent | aa9733f9602c64f1ea4490ec2e9a3602a04e539f [diff] | |
parent | 54aa872e19f75cc0488ee8f0fae831a418950222 [diff] |
[automerger skipped] Merge Android R am: 748c4d5c0b -s ours am: 2786c6a969 -s ours am: 87b1f7f152 -s ours am: 83a95d8828 -s ours am: 54aa872e19 -s ours am skip reason: Change-Id Ib6931e3695458d743667dff2d59acfd156415019 with SHA-1 e3b1744330 is in history Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1422360 Change-Id: Ia89bd74258cfe8a8957ccb9f4b908f370b0a8370