OSDN Git Service

am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread...
authorJake Hamby <jhamby@google.com>
Thu, 9 Jun 2011 18:29:13 +0000 (11:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 18:29:13 +0000 (11:29 -0700)
commit30a1efdf60556e8002ddc0388ac32d113a5be96e
tree713706e3b687bb494c536ef68d1314634302de9f
parent01e9086e30e045d58233c2bfc4504301fb3c0384
parent00ff7d166906b3da1fca69798265c74b0bf5db51
am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

* commit '22165bb54af1cd3cb636c1d65da7c643d854c385':
  Fixes for SMS Cell Broadcast support.