tree f6ef731292201a9ad6bc70c6fdc385db7810bc1e
parent 77bf999d789207fb07cb858cc05c46a311fcf700
parent 12ebd172a1d2a460ea7a8bdc67cfd73403713de1
author Roshan Pius <rpius@google.com> 1507686629 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507686629 +0000

Merge "hikey(manifest): Uprev to supplicant 1.1"