OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b082a3 292ec50)
am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying...
authorDianne Hackborn <hackbod@google.com>
Fri, 8 Oct 2010 22:12:55 +0000 (15:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Oct 2010 22:12:55 +0000 (15:12 -0700)
Merge commit 'db56b9bd39e739474684987b83f386f50596aa5d' into gingerbread-plus-aosp

* commit 'db56b9bd39e739474684987b83f386f50596aa5d':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock


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