OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f64e8cb 196a682)
am 96f660f4: am e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
authorXia Wang <xiaw@google.com>
Tue, 6 Dec 2011 00:32:59 +0000 (16:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Dec 2011 00:32:59 +0000 (16:32 -0800)
* commit '96f660f4a8b99ff387e17474f2574e4e284ceeb8':
  Add extra 2 minute for wifi to shutdown


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