OSDN Git Service

am 46b29d8d: (-s ours) am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"
authorIrfan Sheriff <isheriff@android.com>
Thu, 23 Aug 2012 19:34:19 +0000 (12:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Aug 2012 19:34:19 +0000 (12:34 -0700)
commitb25617e72e10f9b8ffd1d9ca6db5414db6a02e92
tree7ac7d0f6754bfa8f5429dba64d82ddf853440452
parent21b53df7c3fc7501c9c9e238eb820a6dcf992650
parent46b29d8dd558c734f058b3806a0b56a2a23b33fd
am 46b29d8d: (-s ours) am e5773274: Merge "WifiWatchdog: handle exception from ArpPeer"

* commit '46b29d8dd558c734f058b3806a0b56a2a23b33fd':
  WifiWatchdog: handle exception from ArpPeer