tree a7d6c348533177aa55059d998813cd10ffa2daa3
parent 0a20ede5f533a2b4c77e281442b942a58dc98246
parent 874583b91bdc11d40abd8883308f2720c5e3408f
author Dmitry Shmidt <dimitrysh@google.com> 1472593060 +0000
committer android-build-merger <android-build-merger@google.com> 1472593060 +0000

Merge remote-tracking branch 'aosp/upstream-hikey' into bugarm am: 09166485f7 am: dbc168c111
am: 874583b91b

Change-Id: Idc181b2391ba81efc4bb426519410816ec784a66