tree 12774201ceecddaf69b6dea345e74b821448a2d7
parent 05a38ebd5a0d5554e6648eeedff7698a2f1dc1f1
parent 36aa82dda56169333aba6b2c55341404c1d631f0
author Dmitry Shmidt <dimitrysh@google.com> 1473459335 +0000
committer android-build-merger <android-build-merger@google.com> 1473459335 +0000

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

Change-Id: Id311c7cb25b4826fa344375d87db358fbaf62e10