tree c4edf9d97d054e74e0bd33791adc4ea51603e445
parent dd74c249b6f10066b3fba6263b9e3938e241febe
parent aeffde500d2570c14d0dc74f00659ebca98e1e5b
author Dmitry Shmidt <dimitrysh@google.com> 1522189450 -0700
committer Dmitry Shmidt <dimitrysh@google.com> 1522189450 -0700

Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into edk

Change-Id: I74012820a8b8efad7b5e1f43291489a430ed487d