commit | f9b4818dffe3c0de20e8c1ebc4c648ccc04bfd36 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:47 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:47 2020 +0000 |
tree | 808ec2a0acb239a02c24904e977766fafd9023da | |
parent | da67d34d969e98b89abb550fdaa6c3469c550923 [diff] | |
parent | 0f6f3e79e8d34f16eb20d965c4f429f05cd56a46 [diff] |
[automerger skipped] Merge Android R am: 391c7fab8b -s ours am: 1ecf3b72dc -s ours am: 0f6f3e79e8 -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: I8c99253c5a49c5c9ee6eb12014aad2c4b7fb1b8c