commit | 9bd9da4dab4dbf26f000ad1d2ec8de894afa1649 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:18 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:18 2020 +0000 |
tree | 4112fb3189e817120b1282dcc0b15800c573bc09 | |
parent | b5023aad76bab9ad3620b1d6cca468c4d87d19a5 [diff] | |
parent | 4855e32475545f0de94ac2ea72d1460737376772 [diff] |
[automerger skipped] Merge Android R am: 4855e32475 -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: Ib75f8847c7616ce73e6db5fc404c204daa236818