tree ea505ea7b8c8df7e3ef7b7ca59effa57a8af9047
parent 6c0bcf0061afb605bead76e188bc79533d41d6b4
parent dadef6881d43ca796cf98caebcd2817064b267e8
author Treehugger Robot <treehugger-gerrit@google.com> 1481740757 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1481740758 +0000

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