OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 229d3a0 ae62b7b)
am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
authorJake Hamby <jhamby@google.com>
Tue, 7 Jun 2011 23:32:10 +0000 (16:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 23:32:10 +0000 (16:32 -0700)
* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
  Fixes for SMS Cell Broadcast support.


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