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)
* commit '22165bb54af1cd3cb636c1d65da7c643d854c385':
  Fixes for SMS Cell Broadcast support.


Trivial merge