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