am e079ac78: am 7afcd821: Merge "Fix for SmsManagerTest" into gingerbread

* commit 'e079ac78db52e0c85550a333b094b966a15adce8':
  Fix for SmsManagerTest