commit | 4b47250c8dff1171f8bbc4d002f04de2f0f898e7 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 17 19:46:30 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 19:46:30 2021 +0000 |
tree | d6fc62600342d3117da115c58ad22ef995529ea7 | |
parent | 60940ead11c07e12853012a6075627a56f3f79dc [diff] | |
parent | cc857a2db59e33c3b1feb071b91a530322798a4c [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 68a6fe6c82 -s ours am: cc857a2db5 -s ours am skip reason: Merged-In Ie21d558275f6d7580a9963d72d5cba92ed30b962 with SHA-1 60940ead11 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skqp/+/15571787 Change-Id: I1a9ea8f1974118231ff2c5f01509211879088a8a