am 127b5470: am e112dfe9: am 31200f85: am 9c11b9b7: am 106660ad: am dd6592ef: am 502d0584: am 2d9093a1: am a9c36271: am f83050d9: am 17b63ba5: Merge "Remove unnecessary commit/uncommit"

* commit '127b5470e4af86f4850bf0550236d9dc5cd6d8dc':
am 77bc1bc0: am 5111f8cf: (-s ours) am 36b7da79: am ed60c5f3: am 9edb2a35: (-s ours) am 0503ac42: (-s ours) am 6093b8ef: am 24616eff: (-s ours) am e6098b20: (-s ours) am 265861dc: (-s ours) am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release -

* commit '77bc1bc032ddb792d9f268bcb389019ebf50a377':
am 498b3da4: am ea641afd: am 2cb223f1: am 638ff458: am b3f48fb1: am ed772e02: am 9ecf1b97: am 7d4c42af: am e348a313: am ec6e5d37: am de4e579c: Merge "Fix punctuation logging"

* commit '498b3da447c37809be1b5a74c5d236eb4f9812e1':
am 31a44f3f: am c0293820: (-s ours) am 8f96cd93: am f3a4b320: am 76319e9a: (-s ours) am 6a1e1b4c: (-s ours) am 39e82fb5: am c9e08527: (-s ours) am 87fa6995: (-s ours) am f8ce1ffa: (-s ours) am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release -

* commit '31a44f3f8ec5be1b178462f5e7103d0fb6c57db2':
am c56dcf2e: am 018f2a0a: am 5e2f5dd7: am 4e3da8d3: am a386f9fe: am e5a4442a: am edf9db69: am 50a3cfbf: am 5f05a1f3: am 2380f927: am 0013f97d: am 5906b05b: am 7058b02a: Extract a new class for app-specific workarounds.

* commit 'c56dcf2ec4ef57d8a961e5cf94d2bae0a49452f6':
am 4e9338e5: am 42e2e6b2: am 50463682: am 06a31bbf: am acfdcd07: am 048b9be7: am ecff2e4b: am 36ba71fa: am f6a70ad5: am d3cf6715: am a6639636: Merge "Remove unnecessary @UsedForTesting annotation"

* commit '4e9338e5fdba0e25d3a7f3ea403813b19abe7425':
am e91787c9: am 73e82926: am 7cb4daf3: am 5303139b: am 9b6975e9: am fe2cadaf: am 45873fd8: am b993db06: am 9b0bc1d3: am 56dba59a: am 05ea7c5d: am 167ba345: am 89fe1f50: Add a method to work around apps broken by recorrection

* commit 'e91787c9654e10e9e1f74ed4b92f69a035fa43f4':
am 3a84b7e0: (-s ours) am 8319d12a: (-s ours) am 5e803653: (-s ours) am 07b84646: (-s ours) am 50f28828: (-s ours) am 6304d29b: (-s ours) am 90a875ed: (-s ours) am fc6fa43b: (-s ours) am f29ecf9b: (-s ours) am 27ee1f20: (-s ours) Merge "Import translations. DO NOT MERGE" into j

* commit '3a84b7e092c10a03d0a5b37fb3b5d0cb586acb82':
am eb898f0e: am b83fa49a: (-s ours) am 08afe099: (-s ours) am 42fb025c: (-s ours) am 5b59a52b: (-s ours) am b1a4c508: (-s ours) am 5410cdad: (-s ours) am 06168df6: (-s ours) am 29ac49d0: (-s ours) am 93125247: (-s ours) am 7f008a62: (-s ours) Merge "Import translation

* commit 'eb898f0e54d8ed3e82bb98907fb553a3a2526c5f':
am 266cb86c: am ba77d60c: am efc8ac42: am ee855f42: (-s ours) am 0c8f3292: (-s ours) am 71339df2: (-s ours) am 264c88e4: (-s ours) am ddcca5df: (-s ours) am 13bb5a8a: (-s ours) am 7408a092: (-s ours) am 88fcf65f: (-s ours) am 13d7d568: (-s ours) am 23bff513: Merge "Im

* commit '266cb86cdf97b6e0aea3132e3de3da9ca4b44b28':
am eb8c1723: am 82b77523: am ce8d23d0: am 24877193: am 50261d5c: am f2ce81a8: am 9e590f21: am 88ee75d9: am 7818c9ff: am bab46b4a: am d96f63d2: am e2bee5b1: am ede3db51: Merge "Fix a crash on a secondary user" into jb-mr2-dev

* commit 'eb8c172356502faae53885b661e431e55265ec74':
am bdf2fc81: am 092b6652: (-s ours) am 3e563c76: am b26794d4: am ac96dac7: (-s ours) am b6e68b4e: (-s ours) am 8c910aa1: am 626d6e47: (-s ours) am 378164a5: (-s ours) am 8b26ab26: (-s ours) am ea88e2ff: (-s ours) am 150da225: (-s ours) Reconcile with jb-mr2-release -

* commit 'bdf2fc813acdcf38d8e830fbcf9b8e4e1c8b0327':
am 40c4b181: am a31c2094: am 0421dabf: am 6a37c3c6: am 895f5af5: am 78ca4681: am b4231951: am af15c959: am c8d50d47: am e3a72c9b: am ff80ee20: Merge "Modify isAllowedToLog"

* commit '40c4b1815d6f43030d0161d4e95975940eb063a4':
am b58efe4d: am 7f8f0b2f: am 071b2d48: am 2164b4f2: am 3d457bb0: am 6f4405f6: am 68ad73d0: am ba626004: am fe16b5ab: am 418f8753: am 8a6a15e0: Merge "Clean up IntentCompatUtils a bit"

* commit 'b58efe4d92f76aa219b61e8ab5c28e243bc85141':
am 564afa41: am 81180361: am 2aa076c3: am 105340bd: am fc4f011e: am e1f7d93f: am d80e51b8: am a4d9d47d: am 3c6388ef: am ea6a59ff: am 44f679bb: Merge "Fix running on device regression test and profile."

* commit '564afa41f00035f0ecab7e09509102f75208add6':
am e4fed187: am 1f47eac9: am d34e0862: am b5a7d5b1: am 25ba9649: am 3ccbd5a6: am e155ae60: am 13dd760b: am 1e0af2e5: am 48346c47: am d9a87eb8: Merge "Fix drawing debug points of gesture trails"

* commit 'e4fed187cc252b928fe3b5e057ece352d3507a88':
am 2507c552: am 1ef93234: am 886f47a2: am ad1d55f9: am d1fb89b8: am 070bac6e: am c4658407: am 7351ad8d: am 8b37abda: am 75b75d8b: am 5fdea477: Merge "Always record word boundaries"

* commit '2507c552dcbc2c43bd62d5e1b439ec751efc2e9f':
am 9c123608: am c251f9a6: am 885b353e: am a31edc68: am 2a41c397: am aec3d618: am 21988825: am 1f0af7d4: am d19c84ff: am a1f4af50: am d8835326: Merge "Haptick and audio feedback on key repeat"

* commit '9c123608dc469a19c3e30b0dc6f81544bf95d78b':
am d69a80b9: am f58ea266: am a365afc9: am 9ed9f415: am 5ec51af2: am 7a89fa66: am 7565cede: am 31b5abf6: am 71e5b9dc: am 37c2f94b: am dc22b722: Merge "Clean up unused return value"

* commit 'd69a80b9c84d93ba1572824e8d5cc5a8be31cc64':
am 6143898b: am eb1f8575: am 41aa2c85: am 2021f393: am f8ba9d8d: am b841ba2b: am d2351fd8: am 4022aef4: am 3a022999: am 5075d07d: am f6797a5e: Fix missing import

* commit '6143898bc7cc7c749771335b3b085de008ba7b1d':