am 46831e9d: Merge "Fix NPE in SmsManagerTest Setup Method" into gingerbread

* commit '46831e9dea184c0888819aa31f4aea20fb58b81f':
  Fix NPE in SmsManagerTest Setup Method