tree 0875bf46c0a880d19efd627912ed3ff5e6ebf50e
parent b6e0ee9c69e0e3d760cfaa3dca75bdeb9a3fea63
parent 42f4d897b6bff97c1f19d55b8ca45ecdfa081589
author Dmitry Shmidt <dimitrysh@google.com> 1516212754 -0800
committer Dmitry Shmidt <dimitrysh@google.com> 1516212754 -0800

Merge remote-tracking branch 'aosp/upstream-hikey' into atf

Change-Id: I37e6b218f2745a4432645bbff43899d954c19e41