tree 3a3c5774d1704cbd751fef4a024cfbe3799672e5
parent a27b8a12b6c18e02a4bfa12125feeb5f5f0a9079
parent acd487145b888f3a3f31181567c4878de777f8a3
author Dmitry Shmidt <dimitrysh@google.com> 1511906173 -0800
committer Dmitry Shmidt <dimitrysh@google.com> 1511906173 -0800

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

Change-Id: Ia7da9569b03f596805bf705b458daf28901e2ae0