tree aa30a4379194cdb17d0ba95405b471499b23bcb2
parent f0bb18115c163c495da44ef27774121ab3a50e71
parent ca1df0ccac686427880a1d29e8a12ae166753f9b
author Jake Hamby <jhamby@google.com> 1307489530 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307489530 -0700

am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
  Fixes for SMS Cell Broadcast support.