am 553d4e88: (-s ours) am 81b69124: (-s ours) Reconcile with jb-release - do not merge

* commit '553d4e88137b162515524d0a86fbc88c685e6b7d':
am d899dc43: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'd899dc4349131952ad47fe7c184d717472e77547':
  Import translations. DO NOT MERGE
am 6cb0e9bb: ANR in messaging after launch and clicking on an existing thread

* commit '6cb0e9bb8faa8c00294bd35ebebc010979c6669a':
  ANR in messaging after launch and clicking on an existing thread
am cb8815fb: Merge "On receiving a Group MMS the List view displays as two messages received" into jb-mr1-dev

* commit 'cb8815fb447309322097bdd273d610ca5557b21a':
  On receiving a Group MMS the List view displays as two messages received
am 56e8095e: Auto-retrieve of MMS messages doesn\'t work if the option is turned on after a message is received

* commit '56e8095ef2e82f8db5fd4a04fa0a67c91cc7fbd3':
  Auto-retrieve of MMS messages doesn't work if the option is turned on after a message is received
am 4847b981: Group MMS flickers between white square and received message when initially checking

* commit '4847b98115373613b09cf50f43a760e95dd9a15c':
  Group MMS flickers between white square and received message when initially checking
am 01303749: Old thumbnail shown

* commit '01303749a722c0e8c8be740166bf4858c12eb7ec':
  Old thumbnail shown
am 6d2ba55a: Messaging notifications do not always come through

* commit '6d2ba55a4bd1937bbec101ab2a4c005b566b43f8':
  Messaging notifications do not always come through
am ce2abbf3: Merge "java.lang.IllegalArgumentException: View not attached to window manager" into jb-mr1-dev

* commit 'ce2abbf3040005587afd97017a1c46e740d28e46':
  java.lang.IllegalArgumentException: View not attached to window manager
am 67f9035e: Merge "bug #5139811: Get rid of toast for converting message from MMS to SMS." into jb-mr1-dev

* commit '67f9035e9a0651b8bf894568aff8a130a17297d8':
  bug #5139811: Get rid of toast for converting message from MMS to SMS.
am 95e0a156: bug #7128602: Messaging app crash on choosing to share all the picture attachment received on Gmail

* commit '95e0a156327c18f2e9afc72a45a5985ad6ae7abb':
  bug #7128602: Messaging app crash on choosing to share all the picture attachment received on Gmail
am 9be7edc9: bug #7087793: remove "add to people" action menu item for group MMS.

* commit '9be7edc95cd1e40b79a390e8ae173d4e2710527a':
  bug #7087793: remove "add to people" action menu item for group MMS.
am 24149983: Fix a couple of bugs

* commit '24149983964b1de6a98bcefeb5e6ebfa2d0d7953':
  Fix a couple of bugs
am 00d7a79d: am 99cd6ecc: am 39dede5b: am 3a48f611: Merge "Only delete the cache files if cache is null"

* commit '00d7a79d066f598f7347aabd8d51f7f0e6ec1630':
  Only delete the cache files if cache is null
am 3d2624fe: am 20da265f: am b2c79a9e: am fb15d874: Merge "Fix 2 bugs in Mms AppWidget"

* commit '3d2624fe8d50e9bc3afadde0f4f8a48c8ee2de23':
  Fix 2 bugs in Mms AppWidget
am 49c82e29: Draft mms can\'t be sent because the send button is disabled

* commit '49c82e29195c5e18f7c702ae7109eba5d94813d2':
  Draft mms can't be sent because the send button is disabled
am c6501ab9: Don\'t flash attachment box for text-only mms\'s

* commit 'c6501ab9f1882d802ef7805967d936ecce52fbbf':
  Don't flash attachment box for text-only mms's
am 262af08e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '262af08e83c949d3e1f78d906333134c37848fd0':
  Import translations. DO NOT MERGE
am 8913ee10: Merge "Clicking on a persons avatar causes undesired behavior in Messaging" into jb-mr1-dev

* commit '8913ee108856f8c94f479b0e1401023567024185':
  Clicking on a persons avatar causes undesired behavior in Messaging
am ea339a26: Unable to view all participants of Group MMS thread

* commit 'ea339a26d0f2de0087d4c6ebf9f55c505b922695':
  Unable to view all participants of Group MMS thread