tree a7d6c348533177aa55059d998813cd10ffa2daa3
parent c4530b7069267c23a490263bc82aa99970ca4842
parent b99427627b9554343e22d32410587c8378fcd6e6
author Dmitry Shmidt <dimitrysh@google.com> 1472594552 +0000
committer android-build-merger <android-build-merger@google.com> 1472594552 +0000

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

Change-Id: I77c49de43f7a94a8e5e6310331473e2cd50aebb2