tree 51b0b03012f5f2813f46f287ef903c4e16c6f38d
parent 1da20a6212a064e95400ab535fc410d9fa2825c5
parent 64a2c4b3a29ce4ede0bc5dc28a9cbd1b82fff567
author Alistair Strachan <astrachan@google.com> 1537830650 -0700
committer android-build-merger <android-build-merger@google.com> 1537830650 -0700

Merge "hikey960: hikey: add target for AOSP TV builds"
am: 64a2c4b3a2

Change-Id: Ia7dd22ac6664d0fe14fee5613eddea02781a6a4a