am 30cd82c7: (-s ours) am e931d4ea: (-s ours) am e33214a3: (-s ours) am 117dc6ba: (-s ours) am 0a4f507a: (-s ours) am e313153d: (-s ours) am 9e58ced4: (-s ours) am 86bd88fa: (-s ours) am 0e2f68c9: am 42dc0c25: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '30cd82c76c1acce8bfff96aa5827bacd84167476':
am eae3e7e2: am 2a0bb1b5: (-s ours) am 18b361fd: (-s ours) am 0998f0d5: (-s ours) am 80698db1: (-s ours) am da09228f: (-s ours) am e31e4a9c: (-s ours) am ad12dfa6: (-s ours) am dfc0adfe: am b0aabbfb: (-s ours) am 8dafc8e8: (-s ours) am 22e6a5c5: Import translations. D

* commit 'eae3e7e23e6ca993113e507fc874f09ceddd4023':
am 82f32e6e: am 0740e038: am 091210b5: am 206eebbd: am 81b92a35: am 78296e91: am aab8a18b: am 1cb72a09: am 384d4e5b: am 2ad7023c: Fix detecting out of keyboard area

* commit '82f32e6e9242f1c24de86d7cc17283a5c4106df1':
am 763140c9: am b912a401: am 6ec1713f: am faeb31e4: am cb3e8f9c: am bcc04608: am 94734c93: am 1884044e: am 81662dd4: am ba35426f: Merge "Tweak a label in the personal dictionary settings"

* commit '763140c950a104f2ba3968bd42650f4ed7acd045':
am 3d6cdc34: am 76b08e5a: am dd512e68: am 86749e88: am 14a54c67: am b5feac06: am b2e4031e: am 28eab9d5: am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."

* commit '3d6cdc34f9bae02e7d7ff263ebc0c440455f3835':
am 50666638: am 18ad0562: am 8912e833: am 218ab2a2: am db6feecd: am c7f2031d: am 1784791c: am 82e3ea95: am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher"

* commit '506666385eda0ea86138b164288e2b1f6aeb3154':
am e848e1a4: am bafb5828: am 7184208a: am 575d06f5: am 5e0d0242: am dfd21666: am 82e697bf: am 05aa5e75: am 48002809: am 2b5c9726: Introduce another activity to launch setup wizard

* commit 'e848e1a46fcf2d7ab7275f652320f2793eb01a7f':
am 5ee347f7: am faabe9bf: am 53b0617e: am 7ae37424: am 9e533398: am 2ffe29b6: am 4b18d513: am e90fe9c3: am afc40e74: am 4705c0fa: Fix screen flash when launching settings activity

* commit '5ee347f70f02c3c7c4bacdbe087a4b59e2dc2cbf':
am 33402c75: am 710790b0: am 435ded26: am e17d367e: am 38a30fb0: am e3158e93: am aca3b625: am 941e8bba: am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"

* commit '33402c7546d1eb15addfe0abba3642d4814ccd2e':
am 26e975a6: am 1a0556c3: am 3b601576: am c188bb61: am 548778d3: am 398e03ea: am 3ffe11a5: am 4ee6df8d: am 1f8b354c: am 4135c2db: Merge "Avoid NPE by fixing ResearchLogger initialization"

* commit '26e975a62c3481e4bf71fb7c497cce6305126d51':
am 7c772981: am de65abbd: am 011edb32: am 2d82e679: am 2325e858: am 5975a02e: am 28b9aec4: am eaf5c227: am 026b2645: am bb17034f: Merge "Remove ref to LatinImeLogger preference."

* commit '7c7729815869fd4e97c41c6d3123c6bdecf2f525':
am ec14cded: am 81dde43f: am 95d84f60: am cbbe8f2e: am ceedfcc5: am 1da572e1: am 7c2ca940: am 1e0f8cff: am 697f6abb: am 260df841: Merge "Remove unused code"

* commit 'ec14cded6176f9c4aded9fc54acf65a7536914b8':
am 28cfd8e2: am 0cc0e39b: am 0df768ab: am 54eb5bbb: am 1831d86e: am 772990b6: am 22fa8123: am 7bc99237: am 03a32146: am 7d72ca0b: Avoid JsonWriter multi-write error

* commit '28cfd8e28df038fc9643361cf10108ff063a856f':
am 0ab926e7: am 146acafc: am 184fc484: am 77d61817: am 451b6c3b: am 99effbc0: am 645b62fb: am 8738eeaf: am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java

* commit '0ab926e7365b9c89ba4f2b67fbcaffe20354946e':
am 234bcc72: am aef8af97: am c8a5fe51: am 20d4751f: am a3ec57b3: am de1115a8: am 4c6fe8ed: am aaf7d70b: am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"

* commit '234bcc7251c6164456d9383f68925cd816d04d7f':
am 52aa78ba: am 294b2c17: am 4501c75b: am 1ace0735: am 7ff5db64: am 7c856e16: am cae4cd7b: am 66e5e05f: am 6780e43d: am 18184eac: Support regular expression for condition pattern

* commit '52aa78baea0624f040703e211343880d97f32493':
am 604e2bec: am 3ebbd86d: am 3f080835: am db0cc3d5: am a8aa563b: am 4268fdea: am f05eeecc: am 94ad2ef7: am 094447bd: am ad662ade: Disable delete key repeating while in slide input mode

* commit '604e2becee4f1d16bcdbb96a16cd6ebab42c6bb7':
am 100de3cd: am e0a201be: am 6d20e50f: am df4b9eaa: am ce291bfc: am 6399108c: am 209a97bb: am 7a876b31: am 813ba9f5: am 6b0bcfba: Merge "Disable long press timer while sliding input mode"

* commit '100de3cd9b5b42300bd2c92640ac33a3554ee2d9':
am 19d78a04: am 0d2efd20: am c70c32a4: am 84627c43: am 484545c4: am db40c5d7: am 81fabdb8: am 73673b4c: am f1708394: am 0efd8d1b: Fix landscape override value expression

* commit '19d78a049ef2f6de45cccf564cc84c31febf4afb':
am efb67e07: am 8df36e6c: am 1ba88ee3: am 70912057: am 00204d85: am a0167db8: am 4103044a: am c731457f: am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database

* commit 'efb67e07b93ef13535b4e85ac75d39196e6a99a2':