OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eaa8870 aa68c19)
am 5e2e7d5f: am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now
authorIrfan Sheriff <isheriff@google.com>
Wed, 7 Dec 2011 00:04:30 +0000 (16:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 00:04:30 +0000 (16:04 -0800)
* commit '5e2e7d5fb81266640f8284abb25fe8be06693f5b':
  Disable wifiwatchdog for now


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