tree 58e19f79fd49ca0312c902ddca4d8a072b7f2c6b
parent f2bb539744e4a9359637dd30422518833fd9b5bd
parent a3f92afeeb5f51a8ee193dfbf64adf52692a216b
author Dmitry Shmidt <dimitrysh@google.com> 1472604591 +0000
committer android-build-merger <android-build-merger@google.com> 1472604591 +0000

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: da41388f7d am: 62941329a1 am: 1a17964e48
am: a3f92afeeb

Change-Id: Ie2efbd1f7af02bd0459748dd5997f5844c82c91a