commit | 74294325b83e6aad63aa9f0951d26c0eb14e9c34 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:17 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:17 2020 +0000 |
tree | 808ec2a0acb239a02c24904e977766fafd9023da | |
parent | c5e9758271aff77d6448e2375117c027d8e4d800 [diff] | |
parent | f9b4818dffe3c0de20e8c1ebc4c648ccc04bfd36 [diff] |
[automerger skipped] Merge Android R am: 391c7fab8b -s ours am: 1ecf3b72dc -s ours am: 0f6f3e79e8 -s ours am: f9b4818dff -s ours am skip reason: Change-Id Ia4f3ce3113c6199975c391de8fbcf828cca63f13 with SHA-1 43b7ebf015 is in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1422387 Change-Id: I7efdc3970282d86d2cdd56f9f83441fbb03e54d9