tree 51b0b03012f5f2813f46f287ef903c4e16c6f38d
parent 5b7f2e801eef93f642862508d349a2093e15fbc0
parent 34bf915efd9798d4a6d5cd32afb10aa6060e18d1
author Alistair Strachan <astrachan@google.com> 1537830887 -0700
committer android-build-merger <android-build-merger@google.com> 1537830887 -0700

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

Change-Id: I7b22ca08465922160d466416874665c20390f2a3