tree 0875bf46c0a880d19efd627912ed3ff5e6ebf50e
parent ccf328ed59547bb032796dbc8bb875def8bea0c8
parent 090aac9db6f769910ecbc2885ca426a7364ffe57
author Dmitry Shmidt <dimitrysh@google.com> 1516220410 +0000
committer android-build-merger <android-build-merger@google.com> 1516220410 +0000

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

Change-Id: I61511d9c7825ae39e206d7410e5ca9f0f0259472