tree 27e660ce48654904a1e6b25057a81a8f310c2a72
parent f5f1bd0b1c94ec48497313e8ff7d9bb6f53f5ff0
parent 0bd11866146bcecf56923a3fff610dbfee9264d9
author Andreas Gampe <agampe@google.com> 1444782782 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444782782 +0000

am 0bd11866: Merge "flo: conn_init: fix load macaddr"

* commit '0bd11866146bcecf56923a3fff610dbfee9264d9':
  flo: conn_init: fix load macaddr