commit | 0a59fe9a915e27798cb40fc622ca7009fab21788 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 21:46:53 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:46:53 2020 +0000 |
tree | de8eb078a0074d3f7b16aeab032338e98e31a661 | |
parent | bd7a91909b5916bb246448a487b78330e2041fb2 [diff] | |
parent | 19431a7488bdbef8de79184918ef3e6e90c3519b [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 3a6ef723d2 -s ours am: 19431a7488 -s ours am skip reason: Change-Id I893d1bd400022b45538169fdb91a1d4502096240 with SHA-1 40f6e6bf20 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/12470170 Change-Id: Ic44daaa35b6d2f71e6014baff38199c9e93a414b