OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21b53df 46b29d8)
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)
* commit '46b29d8dd558c734f058b3806a0b56a2a23b33fd':
  WifiWatchdog: handle exception from ArpPeer


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help