tree ea505ea7b8c8df7e3ef7b7ca59effa57a8af9047
parent adb90c297827e785b638122b72a638fb3b200ba8
parent 9f98bde85b03fbd7e58f1190b08aeba80d76f97a
author Dmitry Shmidt <dimitrysh@google.com> 1481737875 -0800
committer Dmitry Shmidt <dimitrysh@google.com> 1481737875 -0800

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