am 0e6a6e20: am 420d5286: Merge "Messaging: Scroll up, start typing, when second line reached, the view scrolls" into jb-dev

* commit '0e6a6e2002785c3d9fce172f5bcde1d0d187a2b8':
  Messaging: Scroll up, start typing, when second line reached, the view scrolls
Reconcile with jb-release

Change-Id: Ie9d1c2efee22d3f1c66f48fa2d77690f9937e5cb
am 2b73c4d4: Reconcile with jb-release

* commit '2b73c4d4ca02384a05a054ac5829df73ae8f5360':
Import translations. DO NOT MERGE

Change-Id: I28559c214d4a1aee3fa0ec8583e675d6453de183
am b37e7bd4: Import translations. DO NOT MERGE

* commit 'b37e7bd46494a6921dbc2128ac0d3e065f512626':
  Import translations. DO NOT MERGE
am a5aac7c7: (-s ours) am b37e7bd4: Import translations. DO NOT MERGE

* commit 'a5aac7c799ab4566a3f8d24d4b00866d3185c000':
  Import translations. DO NOT MERGE
am eb1a5d14: Merge "ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME" into jb-dev

* commit 'eb1a5d14f90fcf8516317cef218f6e07a044a081':
  ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME
am cd7af42f: am eb1a5d14: Merge "ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME" into jb-dev

* commit 'cd7af42fc1b0f37baff33ddd8a7cf3609116f3e4':
  ComposeMessageActivity smooth-scrolling behavior wrong and ghostly scrolling when bringing up the IME
am 41e2e460: Merge "Remove blank line after SMS text." into jb-dev

* commit '41e2e460f54fda4c181fd5a2df4709b16123788d':
  Remove blank line after SMS text.
am 4a72fb3a: am 41e2e460: Merge "Remove blank line after SMS text." into jb-dev

* commit '4a72fb3a6a7f52799c75ba16844fd52cda991aa2':
  Remove blank line after SMS text.
am b9e796c4: Merge "Show blank line after SMS text to get the smallIcon back." into jb-dev

* commit 'b9e796c4ad42329ae2783cdc9c2673ed1d6e7669':
  Show blank line after SMS text to get the smallIcon back.
am 952d9778: am b9e796c4: Merge "Show blank line after SMS text to get the smallIcon back." into jb-dev

* commit '952d97788a9085a1453fdffc678320783eb8f73c':
  Show blank line after SMS text to get the smallIcon back.
Import translations. DO NOT MERGE

Change-Id: I466922147a154676d529daed652180e607adb050
Merge "Import translations. DO NOT MERGE"
am c4bef2de: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit 'c4bef2dee1a145f0a7b41020b3e97fa30540698e':
  Import translations. DO NOT MERGE
am 3015dfd0: (-s ours) am c4bef2de: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '3015dfd07b47a92a80551a882154180c7f5e8daa':
  Import translations. DO NOT MERGE
am b8ff5f43: bug #6664404: fix gratuitous scrolling in MMS compose activity.

* commit 'b8ff5f43809661d46e89a40cce06a54587383112':
  bug #6664404: fix gratuitous scrolling in MMS compose activity.
am 2fdb00cb: am b8ff5f43: bug #6664404: fix gratuitous scrolling in MMS compose activity.

* commit '2fdb00cbaaa12c9659c8c0b4df8d0a5377cb66be':
  bug #6664404: fix gratuitous scrolling in MMS compose activity.
Merge "Fix the typo error of the smiley text"
am f74be328: (-s ours) Merge "Fix the typo error of the smiley text"

* commit 'f74be3284f5d779046eb06f2bfcc3d7ac80d75e9':
  Fix the typo error of the smiley text