commit | 83a95d8828c572acf874dee48dbad01f10e8f7cd | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:36 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:36 2020 +0000 |
tree | 105740fbb3b59823bddfaae294f7bb7b300ffdb7 | |
parent | f2fc71819f92ee8126a82b04bd43fe30e435ff3a [diff] | |
parent | 87b1f7f152859298715951791251cac3fd73aab8 [diff] |
[automerger skipped] Merge Android R am: 748c4d5c0b -s ours am: 2786c6a969 -s ours am: 87b1f7f152 -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: I8685dae8d18f1850613f42ac8911f650d518839d