tree 12774201ceecddaf69b6dea345e74b821448a2d7
parent 874583b91bdc11d40abd8883308f2720c5e3408f
parent 4f9328119c263726d9284ea2c9406b41885d0afb
author Dmitry Shmidt <dimitrysh@google.com> 1473458853 +0000
committer android-build-merger <android-build-merger@google.com> 1473458853 +0000

Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: 1f3ebb070b
am: 4f9328119c

Change-Id: Ib6b7605cec7e47b34c99a1775640583ec7df578d