tree 0875bf46c0a880d19efd627912ed3ff5e6ebf50e
parent 07f5202bf49953143a809608736fae6402b21b27
parent 2afd8f04b38aca9a7b9b1148da1756272c32fa4e
author Dmitry Shmidt <dimitrysh@google.com> 1516220249 +0000
committer android-build-merger <android-build-merger@google.com> 1516220249 +0000

Merge remote-tracking branch 'aosp/upstream-hikey' into atf am: 8608ac5262
am: 2afd8f04b3

Change-Id: I6476ff0764e976ce4b3a684c1ea0ff3d702fb09c