am d631fedb: Merge change 25109 into eclair

Merge commit 'd631fedb6cec492812afc5082461afcbfa4ae07f' into eclair-plus-aosp

* commit 'd631fedb6cec492812afc5082461afcbfa4ae07f':
  Some SMS logging improvements.