am 294cb905: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '294cb90565349ecd1e77acafa1ca1c917925255e':
  b/7363553: fix a regression where keyboard isn't shown when composing a new message in SMS.
  b/7363553: fix keyboard interaction when re-entering Compose Message activity.
  IME dismissed when composing message
am b7c4364c: WRITE_SMS is possible through SMS_RECEIVED intent

* commit 'b7c4364c750df605a604b066bcd77741bb248aab':
  WRITE_SMS is possible through SMS_RECEIVED intent
am b7c4364c: WRITE_SMS is possible through SMS_RECEIVED intent

* commit 'b7c4364c750df605a604b066bcd77741bb248aab':
  WRITE_SMS is possible through SMS_RECEIVED intent
am 774b1907: am b7c4364c: WRITE_SMS is possible through SMS_RECEIVED intent

* commit '774b1907d7828330fa437e44aa4fde4c83ab8dfb':
  WRITE_SMS is possible through SMS_RECEIVED intent
am 908e0b64: am 774b1907: am b7c4364c: WRITE_SMS is possible through SMS_RECEIVED intent

* commit '908e0b64865ea02d31de136ef1372a4b5ed40172':
  WRITE_SMS is possible through SMS_RECEIVED intent
Removing dead API

Change-Id: I06573f52e39dd440c0f0b8406b043fa39ede7653
merge in jb-mr1-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-release - do not merge

Change-Id: I2273a7eb31d008d9e4137b61ff7a4755942f165c
am c19c8d3a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c19c8d3a87f770b7fafd32957af04f6a6fff56b2':
WRITE_SMS is possible through SMS_RECEIVED intent

Bug 7442369

Don't export TransactionService and SmsReceiverService. Those services
can only be started internally.

Change-Id: I0e23ca73868ae63cfb419b413e488ecf8eb2361e
merge in jb-mr1-release history after reset to jb-mr1-dev
am e19c8b0f: (-s ours) am 80b12abf: (-s ours) Import translations. DO NOT MERGE

* commit 'e19c8b0ff85836a98ce024481af4b1e8827088e2':
am 02fb7cb6: am 99f6f640: Max file size limit from the same phone could be different across different runs attaching a captured video

* commit '02fb7cb699ab2bbaee2434a1d1235721895011a4':
am 6a2f4fd0: (-s ours) am 28c4d674: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '6a2f4fd08610eaea6b7888054a0cb33ee7214444':
am 80e0de9c: am d2885b15: Merge "b/7363553: fix keyboard interaction when re-entering Compose Message activity." into jb-mr1-dev

* commit '80e0de9cae48a3bc9680cb4c26f2d9db8fa869ed':
am 97dc7b5b: am 8cc338d3: Empty draft created on deleting a group MMS message

* commit '97dc7b5b43007e143f10ae7e4db8ff4290f6f943':
am 9949b1e4: am 14ec4de3: Merge "b/7363553: fix a regression where keyboard isn\'t shown when composing a new message in SMS." into jb-mr1-dev

* commit '9949b1e4fc950a4df61ab48f6e05fe28e381362b':
am b1c64f54: am 868f2d2f: Merge "MMS creates a new thread when receiver is not in the Message thread" into jb-mr1-dev

* commit 'b1c64f54ef0ccbfae318f7600670e5940d9585d2':
am 85664cdb: am 9f12dda4: Merge "Size limit reaches for video recording even before time lapse from Messaging" into jb-mr1-dev

* commit '85664cdbb5eacd53353cad1608f274b2e281e870':
am 4168442e: am 8e44e61e: Merge "b/7363553: part 2 of fix keyboard and window layout interaction when re-entering ComposeMessageActivity." into jb-mr1-dev

* commit '4168442e28b0c554cc1f04b0e373fb1148c07ba5':