tree 538058f0657edb8343444b5a179ff604db33e7a5
parent c98b5390646cc154936f9a4ca8f2437d226bf152
parent 15efc9efd6083daa701e28c695751d4340e60aea
author Dmitry Shmidt <dimitrysh@google.com> 1472161757 +0000
committer android-build-merger <android-build-merger@google.com> 1472161757 +0000

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp
am: 15efc9efd6

Change-Id: I9faf2ba2dc35d01273a521c7479e473821a170b5