| commit | 5df4e04cfdbf9b5b9ede70ae4a73f6870052196f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:06 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:06 2020 +0000 |
| tree | ced2139b0deb2d55ee13f0c9ce617cd98aecbd26 | |
| parent | 7a0ca395a9e357880ebd05d37c41b74eb74a3fdf [diff] | |
| parent | a073adf313aff9dfcbcc40a03ba34b28570dd03d [diff] |
[automerger skipped] Merge Android R am: 4855e32475 -s ours am: 9bd9da4dab -s ours am: 48d3860413 -s ours am: a073adf313 -s ours am skip reason: Change-Id I3ee1855cba8f1f2f19dd99307d4d527903f93749 with SHA-1 b5023aad76 is in history Original change: https://android-review.googlesource.com/c/device/google/atv/+/1421949 Change-Id: I6e2cd4e43ee4354f7a208da03c68f24214a87772