Change-Id: I5be7339c4797b0308c1a192d2984056619fdfbdd

Change-Id: I470ba8a03d70aa520311c50f5d21979f476798b7

Bug: 17797064
Change-Id: Ie992c9454edfc3bf93d5ea367c3a4427b513a205

Bug: 10059681
Change-Id: I0cadf1f80103136cdac5c00b6fca4d81b4bf7384

Change-Id: Idf03e97661d64186c752e35964d641a5528be5b1

Change-Id: Ib9dbbb4bd4e35c15fd752c364d3012e8a7da2410

Change-Id: I54a4b89db84bbbd6bc7f5886f27b8bb6429ca8db

Change-Id: I0d18562a0b036a3e76a6df989a143bb05f0ed833

Bug: 10059681
Change-Id: I90334caaf37c84ce7d1b93d12efbfb5f244a9420

Bug: 10059681
Change-Id: Ic6947e76d77dc87bf88dc3a2b749e41fae7553b7

* commit 'b8893c04':
  Fix restore from keyboard

* commit 'd4662983':
  Fix restore from keyboard

automerge: e5515395

* commit 'e5515395':
  Fix restore from keyboard

Oops.

Change-Id: Ib7c8c8284b55a6a6db5b5806ff40188fd06b57fb

Also why did we have two copies of LocaleUtils >.>

Bug: 18108776
Change-Id: I03b4403dfd51934e66b567f2f8b87da419cfb3ab

Change-Id: If4d358b3a11fb25fc214c728269519d8c25f9adc

The keyboard starts up before the restore process and the default shared
preferences are cached and used even after the restore.

Bug: 17837918
Change-Id: I2669e377b6e95813657fd6a80fbff4472330e3aa
(cherry picked from commit e9d81467)

Change-Id: I82d5a17a5ec96f26047d29e79f3f28850fc5b3bb

Change-Id: I0f95f603d80570c937e8c38ded88df341c11795e

Change-Id: I89aaf87d7d0cc204b0ca0f61c2f64d15e2df848e

Change-Id: I4b38b31403db1ee5b5bab7a6328db1919d822d20
Auto-generated-cl: translation import