Commit graph

11981 commits

Author SHA1 Message Date
Satoshi Kataoka
f555b25503 am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '5d33d2c2d88cd6385cea7b48f9b79a1f4947298a':
2013-04-03 19:24:14 -07:00
Baligh Uddin
8e48a61891 am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit '18e45a9394ca4932b7e657b27a32983e5235dcda':
2013-04-03 19:24:13 -07:00
Satoshi Kataoka
c3c1b4db78 am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '5d9459df0fa3f8c9534e9b52565013d7a4c8541e':
2013-04-03 19:24:11 -07:00
Tadashi G. Takaoka
5664228157 am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit 'd7bcc52d1f0460317498298b27b049f15e0d8120':
2013-04-03 19:24:10 -07:00
The Android Open Source Project
b2c2ce310c am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '7de82b0e35362dbaaa0be1e2aab20343c0b0d77b':
2013-04-03 19:24:09 -07:00
Alan Viverette
d19c71d984 am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
* commit '3c082157c00e323ce3ad6fa811afbde3054f2755':
2013-04-03 19:24:08 -07:00
Jean Chalard
724ff2980d am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
* commit '4ddfde7b38b00365d75727b674648072db657b47':
2013-04-03 19:24:06 -07:00
Jean Chalard
93465ea3bb am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit 'a747d76285a94111485eceda9011141ffe738294':
2013-04-03 19:24:05 -07:00
Baligh Uddin
1368eeee15 am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '108ee45228ee1a17195cd0b86b2e29ed0c4181e5':
2013-04-03 19:24:04 -07:00
Baligh Uddin
119eaf7a27 am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit 'c1283003f53fd6b14727ff8ec46801176845a769':
2013-04-03 19:24:03 -07:00
Baligh Uddin
68889f1c34 am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '0b227bb9619c12f635bdc67b915d8f3babe28b36':
  Import translations. DO NOT MERGE
2013-04-03 19:24:02 -07:00
Satoshi Kataoka
e8a3e96447 am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '395e500b0905880e59c9e1b2442b37702a0ab78a':
2013-04-03 19:24:01 -07:00
Satoshi Kataoka
619d1f73d4 am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '0c99a379bd7eca152fa600a6ab4c214482270625':
2013-04-03 19:23:59 -07:00
Kurt Partridge
867b2380b9 am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '35e02ccdda43bb40cf95bca5ec0d96e55848d862':
2013-04-03 19:23:58 -07:00
The Android Open Source Project
a6dcb55eab am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '62adeccdcab0c41d502214f31c7a0fa333638e13':
2013-04-03 19:23:57 -07:00
Alan Viverette
8e5fa88a00 am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit 'f518e71ad276678ef891fe7819b6ca9376609190':
2013-04-03 19:21:20 -07:00
Satoshi Kataoka
33c91be35a am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '40be0244bd15c41a3eff33f00108e84c626ad13b':
2013-04-03 19:21:18 -07:00
Tadashi G. Takaoka
e0aa938339 am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit 'a7353ddac8bd206501714a72c62c15c5a8f8f3c7':
2013-04-03 19:21:17 -07:00
Tadashi G. Takaoka
4e627c214d am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit '56796cd76efe9fa63b62cd075725b4d754eb430c':
2013-04-03 19:21:16 -07:00
Satoshi Kataoka
5d33d2c2d8 am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '9b969b261cdb57f6c17154742be03a2b617ad41d':
2013-04-03 19:21:15 -07:00
Baligh Uddin
18e45a9394 am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit 'f1c2946cc8b24b9b845f8b6b8c37f18f7bed0449':
2013-04-03 19:21:13 -07:00
Satoshi Kataoka
5d9459df0f am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '67d1bdd48812a382d859c79ea9f48c6551f616a5':
2013-04-03 19:21:12 -07:00
Tadashi G. Takaoka
d7bcc52d1f am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit 'f510d1542f515ff15c38ace4e430d19aa2b429a9':
2013-04-03 19:21:11 -07:00
The Android Open Source Project
7de82b0e35 am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '6ab186a14c68b37003a5f670323b03a9d0399c62':
2013-04-03 19:21:10 -07:00
Alan Viverette
3c082157c0 am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
* commit '44678fcf2349486f7f614dd7bce3807bb62223ad':
2013-04-03 19:21:08 -07:00
Jean Chalard
4ddfde7b38 am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
* commit 'a050834cdc5aff4c85db256f2992e67a02e23de2':
2013-04-03 19:21:07 -07:00
Jean Chalard
a747d76285 am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '6e78878f7b038afa46afc75117cd773e2d181a5c':
  Increase string limits
2013-04-03 19:21:06 -07:00
Baligh Uddin
108ee45228 am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit 'f980ec6c5bc7452b4e1c6c312fea8b6eb169b2ae':
2013-04-03 19:21:04 -07:00
Baligh Uddin
c1283003f5 am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '6e0e8dd6d0706a128cc69cb4578227c8df6a2a44':
  Import translations. DO NOT MERGE
2013-04-03 19:21:03 -07:00
Baligh Uddin
0b227bb961 am 57b68207: Import translations. DO NOT MERGE
* commit '57b682074820805a19eee151bf54e73508262d08':
  Import translations. DO NOT MERGE
2013-04-03 19:21:02 -07:00
Satoshi Kataoka
395e500b09 am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'bb9a8e082aebbcdd46e4d2378d9839f896c15476':
  Fix Possible NPE
2013-04-03 19:21:01 -07:00
Satoshi Kataoka
0c99a379bd am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'e42522f33566857402a8db645f58de2818456dc7':
  Fix possible SIOOBE
2013-04-03 19:21:00 -07:00
Kurt Partridge
35e02ccdda am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit 'bf62dc036f1e71751c8713ff13e686bbf635d6c3':
  Close ResearchLogger upon onFinishInputView
2013-04-03 19:20:59 -07:00
The Android Open Source Project
62adeccdca am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '577f08a3d76343f67f6f68c4f8198557e73939dd':
2013-04-03 19:20:58 -07:00
Baligh Uddin
c33a0ab343 keep history after reset to jb-ub-latinimegoogle-azuki 2013-04-03 19:16:52 -07:00
The Android Open Source Project
2c7b1b82c5 am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit 'd2582473b0ede953ed2a4b40c5033430d2dca969':
2013-04-03 18:10:50 -07:00
The Android Open Source Project
d2582473b0 am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '229537407a05b96f9a8bc77de8bb9830c7ad3083':
2013-04-03 18:05:33 -07:00
The Android Open Source Project
229537407a Reconcile with jb-mr2-release - do not merge
Change-Id: I00b5f6a7f1d9578933c846c7614eae3bff5b85f0
2013-04-03 16:43:45 -07:00
Baligh Uddin
3bc22c565e am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'e7d91194545ab8af13e612951f836906085b83e5':
  Import translations. DO NOT MERGE
2013-04-03 15:41:47 -07:00
Baligh Uddin
e7d9119454 am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit '370070ae6bfe0af7186d76b61fd6c7bc60eb52b4':
  Import translations. DO NOT MERGE
2013-04-03 15:37:55 -07:00
Baligh Uddin
ac68b5cebf am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '4b8494c4fc75685b6acfcf1b1e16835171f1226d':
  Import translations. DO NOT MERGE
2013-04-03 15:36:27 -07:00
Baligh Uddin
370070ae6b am 4cdb7ccb: Import translations. DO NOT MERGE
* commit '4cdb7ccb325db33fa812855b6ea6de2533cdb6be':
  Import translations. DO NOT MERGE
2013-04-03 15:34:22 -07:00
Baligh Uddin
4b8494c4fc Import translations. DO NOT MERGE
Change-Id: I66b30c5f9673fc4ed3b96753cfec023e7d498dec
Auto-generated-cl: translation import
2013-04-03 13:13:26 -07:00
Baligh Uddin
a631cedeee Import translations. DO NOT MERGE
Change-Id: Icf73894934ceedf45d493c67cdc4018ebcb3f7a1
Auto-generated-cl: translation import
2013-04-03 13:08:04 -07:00
Baligh Uddin
128ab7e5e3 Import translations. DO NOT MERGE
Change-Id: Icc098a0e892cee76ccef2492d32798d38a621dfb
Auto-generated-cl: translation import
2013-04-03 13:07:12 -07:00
Baligh Uddin
4cdb7ccb32 Import translations. DO NOT MERGE
Change-Id: Ic405d085ced9e64efd9b7da38097734c71808fbc
Auto-generated-cl: translation import
2013-04-03 13:06:22 -07:00
Satoshi Kataoka
0b0d9827a0 am 95fe8267: Move suggest logic to AOSP
* commit '95fe8267955ba5bfcc3cf38383f0d13026287082':
  Move suggest logic to AOSP
2013-04-03 05:09:22 -07:00
Satoshi Kataoka
95fe826795 Move suggest logic to AOSP
Bug: 8197301

Change-Id: I2d0ffbbc9d4d57ebfc2fe43e6cb75e8b44dae466
2013-04-03 21:00:57 +09:00
The Android Automerger
1a65d4684b merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-02 09:19:17 -07:00
Jean-Baptiste Queru
a21bec1335 am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '30667266dd48326388ae3e2a62429d5766211bfc':
  Import translations. DO NOT MERGE
2013-04-02 07:53:03 -07:00