tree 7a25a7591b74a2eed33265838681a8a54115f7e5
parent 72d3cef8675b4a8eced300adeb148a835b7fdd57
parent 085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd
author Elliott Hughes <enh@google.com> 1408390716 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408390716 +0000

am 085889e3: Merge "WifiP2pWfdInfo set device type bugfix"

* commit '085889e37f5798dd50ec8c66cd0e2cd2ec37c6bd':
  WifiP2pWfdInfo set device type bugfix