am fd8572b9: am 24f1eb68: am 76d27afb: am e05c7d4d: 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 'fd8572b913bc091288d14961e5056081146c20d2':
am 3b758f8b: am cfd5c3a5: am 55b7b9ed: am 9abce57e: 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 '3b758f8b2161b399434f9f481abe907e8b4d29b9':
am 149473f1: am 7847730e: am 83e8e068: am af699e3a: 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 '149473f194ff8ee0e7d2a169755abf38904d3b25':
am c2a6d52a: am 093d5102: am 629ef368: am d61c92b4: 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 'c2a6d52a03b1a54640f583cd03df89f4dd994ce8':
am 97c12f02: am ecb048a7: am fa0e48a3: am a561bc70: 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 '97c12f029739713e3bbc1bc5b094aab1939291aa':
am f25e3ec5: am ff0b596b: am 0fc12f21: am 45fae2b2: 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 'f25e3ec5c95fecab99e0d1e41dedb6e07ef27f94':
am 136be480: am fc06b1e9: am c106b23b: am 3c61c0b9: 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 '136be480a81828a4d0351f9c6318c22021a2dc10':
am 9bb483a3: am 4991c75d: am 09c95594: am d2a54da7: 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 '9bb483a38b127b9582a930acfda68dff9d0341e0':
am 7665237c: am e956bb7c: am c2687cfd: am e4e60ed6: 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 '7665237cc190e9b15be93975be999f45dd975d41':
am 901513cb: am 6657ad76: am 14cd92a5: am 2a968cfc: 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 '901513cb45155d889157d1f6fe8889b280965858':
am 66464b2d: am 942989c4: am 588ba493: am 9e775acf: 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 '66464b2d3a30f796cdc2b713f7258b1b87bd7b03':
am 84d2042a: am f5928a5b: am 608bf9c0: am cc048ae7: 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 '84d2042a376a2d78be10dc7242cb401392a6f462':
am 52ae409f: am c150a70e: am d60b62b4: am bb0776cf: 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 '52ae409f21dcf960b0b5706cb70c93a1df3c91f1':
am 490dedf2: am 53d9eb5b: am 80993791: am b78fcc48: 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 '490dedf228e60b03e59bba3e2cc51c688fb25fe4':
am a4793628: am 6b46047d: am 97b3802b: am 61956467: 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 'a4793628faadcd5274d1baf4d7eba5e67756c387':
am d5437ba9: am f2d89625: am 4339890f: am 7904ab08: am 75c92ad5: am b31c6518: am b1c6ffd3: am 63fc524f: am 61629255: am c05c2526: am 93a1540a: am f1973350: am a70da988: am 5f857a35: Merge "Disable functional key while in sliding input mode"

* commit 'd5437ba9b9bcd9a20fb84c4f76b16edb8ce1e2a3':
am f667e6fe: am d911b72a: am 7554e6de: am 5312bbe0: am 796613fd: am ec462f9f: am 5ced4cf2: am e3748ed9: am a295927b: am c8d6683a: am aeff9902: am 7e52c35d: am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X"

* commit 'f667e6fe27b4341b17c3bd97c9f369cc540ed83a':
am 919623e5: am b9c7848b: am 29e37ab9: am 02d12809: am db0d2254: am ec517ec7: am d0648d66: am 8185b774: am 4e7c1637: am f6270ab2: am b76d1737: am 2d86b73f: am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds

* commit '919623e5ccac69a63bc3c4bd035b01d121b4c737':
am 13d3fdc6: am d1956871: am 0cd84b66: am 069abe75: (-s ours) am 23cfda86: (-s ours) am e6f04426: (-s ours) am db1f0ac7: (-s ours) am a5f03a1f: (-s ours) am efcd9c78: (-s ours) am fff0c8a9: (-s ours) am 29cfa87b: (-s ours) am fd2c2e62: (-s ours) am 298d8232: (-s ours)

* commit '13d3fdc642f4be97728be916c38019a0febd1308':
am ac57ed03: am 76cdedb8: am f5ccc3dd: am 458fcc20: (-s ours) am ad952e0e: (-s ours) am 1f0a9bd4: (-s ours) am 7c3ffb45: (-s ours) am 905f34ff: (-s ours) am 5576afdb: (-s ours) am 7897e758: (-s ours) am d64589b4: (-s ours) am 8587e879: (-s ours) am 5ec5e0b6: am e69066

* commit 'ac57ed03e70ec1fed687d97a162ee730e144b065':