commit | 5e3b1916ad968971aa8edd01acd0ecf9acb8b340 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 21:46:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:46:46 2020 +0000 |
tree | ced2139b0deb2d55ee13f0c9ce617cd98aecbd26 | |
parent | ba8fbf5bcedfedc405d3783ea92bf8b2cf11ca9b [diff] | |
parent | 0495743439474203abb7a2bfa0e347a187ab79b4 [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 1b4e77aa04 -s ours am: 0495743439 -s ours am skip reason: Change-Id I4a73fed034608c137d05d97a09cf3fd78b621ea9 with SHA-1 239ab93c91 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/atv/+/12469237 Change-Id: Ie67d0915799f5b2f26464d2ad976d0e263289939