| commit | 1431119b89f1ceef375ebe9cb8d98c8d2364a5cc | [log] [tgz] |
|---|---|---|
| author | Artur Satayev <satayev@google.com> | Fri May 21 13:09:59 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 21 13:09:59 2021 +0000 |
| tree | ad5ba8b4b8bf2bd8b798fec505932e508b517512 | |
| parent | 79bc5a1a78c93cb391c9da7ac6105726a1a7ea84 [diff] | |
| parent | d233bcac83af621ceb9bbe0fa5244e78521923ba [diff] |
resolve merge conflicts of c132ddb737875d57300a5cf03790d149ed882f3c to sc-v2-dev-plus-aosp am: d233bcac83 Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/14678274 Change-Id: Iad96c9c7529be22a538af2ea7489a67ebd0c84a6