Jean Chalard
|
186cf922f0
|
am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) 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 '288deb7ab980dc37892b451206b653cbc24b2814':
|
2013-04-10 19:45:44 -07:00 |
Jean Chalard
|
2cef432317
|
am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit 'db3713a1b9e9b144ddb728bab0a1d4babd7b924a':
|
2013-04-10 19:45:43 -07:00 |
Baligh Uddin
|
e04cee4fe6
|
am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '492016265c8d4eeff78656d57fa8b8cf5a43709e':
|
2013-04-10 19:45:41 -07:00 |
Baligh Uddin
|
3df28d1495
|
am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '14d778b27c79cc027ccc451514db9e2bd6ef9ab7':
|
2013-04-10 19:45:40 -07:00 |
Baligh Uddin
|
719e57293d
|
am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit 'e71516b290fb137d6b926df23fcc383866bdf069':
|
2013-04-10 19:45:38 -07:00 |
Satoshi Kataoka
|
5db288268b
|
am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'b3796ab2a7c66e8bcd6911bb1dc0fa8982f16d0a':
|
2013-04-10 19:45:37 -07:00 |
Satoshi Kataoka
|
71f828b12a
|
am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '9ff33b6dfa6641a5fe064624e07182db042df92f':
|
2013-04-10 19:45:35 -07:00 |
Kurt Partridge
|
a6092dc8a5
|
am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '504bbe38f7ca172a88a10c83064d8dda81e5d1dd':
|
2013-04-10 19:45:34 -07:00 |
The Android Open Source Project
|
19289df5e4
|
am e279de02: (-s ours) am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e279de0265b985d2980d1cf7973e9b81f068b933':
|
2013-04-10 19:45:32 -07:00 |
The Android Open Source Project
|
d9f9ba395f
|
am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '4b176a0104adb5f76809b847463cd665d5b75933':
|
2013-04-10 19:45:31 -07:00 |
Baligh Uddin
|
536ec3bf58
|
am b4fbb295: (-s ours) am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'b4fbb295511efd42d164454386f1b756df9854f5':
|
2013-04-10 19:45:29 -07:00 |
Baligh Uddin
|
f420e3bf9a
|
am 792abb73: (-s ours) am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '792abb730b813fda85500092d24634b7ab7008e3':
|
2013-04-10 19:45:27 -07:00 |
Baligh Uddin
|
82c49d746d
|
am c1f3a801: (-s ours) am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit 'c1f3a8012cb5b7a879c7485a5eac846571ad3c5e':
|
2013-04-10 19:45:25 -07:00 |
Satoshi Kataoka
|
62f52e4fce
|
am a514e958: am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit 'a514e9580115c059bd509f7a0b58a0086c60ac91':
|
2013-04-10 19:45:23 -07:00 |
Jean-Baptiste Queru
|
626dd2a0ab
|
am 784eda74: (-s ours) am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit '784eda74afcc48876972bb00cf504d4049b00f16':
|
2013-04-10 19:45:22 -07:00 |
Jean Chalard
|
288deb7ab9
|
am 11034c34: am dee08de2: am 724ff298: (-s ours) 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 '11034c340a0b5fc294b69bb1c37e159255dd6ba5':
|
2013-04-10 19:40:20 -07:00 |
Jean Chalard
|
db3713a1b9
|
am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '9f9050d18fc3708badc6f906744d500458c70d36':
|
2013-04-10 19:40:18 -07:00 |
Baligh Uddin
|
492016265c
|
am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '0b758ec77fc14f768ddea0693e5d412086a591ef':
|
2013-04-10 19:40:17 -07:00 |
Baligh Uddin
|
14d778b27c
|
am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '3847aa30ae68a7e94daa484643ea68f16860d062':
|
2013-04-10 19:40:16 -07:00 |
Baligh Uddin
|
e71516b290
|
am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '5244d6378ce3df391ea855e8dbc87e5e648ea042':
|
2013-04-10 19:40:14 -07:00 |
Satoshi Kataoka
|
b3796ab2a7
|
am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit '82a67bc8bbef7b9553d128f01e0813e63a3ac0ba':
|
2013-04-10 19:40:13 -07:00 |
Satoshi Kataoka
|
9ff33b6dfa
|
am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'd430c1b6bfccc11d272ca55894997e0c9efecb0d':
|
2013-04-10 19:40:12 -07:00 |
Kurt Partridge
|
504bbe38f7
|
am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '798820ab1d3c3da6b442f230a2c70ccb83f96ce3':
|
2013-04-10 19:40:10 -07:00 |
The Android Open Source Project
|
e279de0265
|
am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'ab6fa041587fcca7abd507f25bc07593074a97f2':
|
2013-04-10 19:40:09 -07:00 |
The Android Open Source Project
|
4b176a0104
|
am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '83346295ea6fcd4cf29fbe164bb2df76a6449dc9':
|
2013-04-10 19:40:08 -07:00 |
Baligh Uddin
|
b4fbb29551
|
am d3ae58ef: am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit 'd3ae58ef1b18e015c4f2fe4b46c78eef7be02bb5':
|
2013-04-10 19:40:06 -07:00 |
Baligh Uddin
|
792abb730b
|
am 3c163ec1: am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit '3c163ec1732d00c9e726f22d27ef92057f685c04':
|
2013-04-10 19:40:05 -07:00 |
Baligh Uddin
|
c1f3a8012c
|
am 8acb56b6: am 128ab7e5: Import translations. DO NOT MERGE
* commit '8acb56b60be5ad5009b7ffe96b035c067e03a958':
Import translations. DO NOT MERGE
|
2013-04-10 19:40:04 -07:00 |
Satoshi Kataoka
|
a514e95801
|
am a2b129e9: am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit 'a2b129e9ae369dae3001d2c0efe2b0746421930a':
|
2013-04-10 19:40:03 -07:00 |
Jean-Baptiste Queru
|
784eda74af
|
am d9f35e32: am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit 'd9f35e322681214ba62e1d89ec6fabfc7ff88c11':
|
2013-04-10 19:40:01 -07:00 |
Jean Chalard
|
11034c340a
|
am dee08de2: am 724ff298: (-s ours) 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 'dee08de2c5bc71fdeb3182a8ddd1a10568ac33ef':
|
2013-04-10 19:34:31 -07:00 |
Jean Chalard
|
9f9050d18f
|
am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '2cb50a05cd1d35a422666b6893a2a77c69c1b700':
|
2013-04-10 19:34:30 -07:00 |
Baligh Uddin
|
0b758ec77f
|
am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit 'e7edb5617447cf00eaedb33f5df87223c81209cf':
|
2013-04-10 19:34:28 -07:00 |
Baligh Uddin
|
3847aa30ae
|
am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '781195f438226e1f556850198c5e51b19523ba63':
|
2013-04-10 19:34:27 -07:00 |
Baligh Uddin
|
5244d6378c
|
am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '41db26ed189bac6ae46b4f5d346839b8ec03cced':
|
2013-04-10 19:34:26 -07:00 |
Satoshi Kataoka
|
82a67bc8bb
|
am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'e3c0cca463f9e85657d99cecdf88d4aa3c5c2ee0':
|
2013-04-10 19:34:24 -07:00 |
Satoshi Kataoka
|
d430c1b6bf
|
am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit 'd6f56350fcc63a35506023d555ab66ba3481ad30':
|
2013-04-10 19:34:23 -07:00 |
Kurt Partridge
|
798820ab1d
|
am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '3012c891ba1ce9282b38ad06b3249b682365e7a5':
|
2013-04-10 19:34:22 -07:00 |
The Android Open Source Project
|
ab6fa04158
|
am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e72a088fe2858cbc479259bdf858e8b4cb348690':
|
2013-04-10 19:34:20 -07:00 |
The Android Open Source Project
|
83346295ea
|
am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
* commit '2c7b1b82c58e75594f0da1121622caba3b542377':
|
2013-04-10 19:34:19 -07:00 |
Baligh Uddin
|
d3ae58ef1b
|
am 3bc22c56: am e7d91194: (-s ours) am 370070ae: am 4cdb7ccb: Import translations. DO NOT MERGE
* commit '3bc22c565eb00ba01582ef7dc6d09679b51022de':
|
2013-04-10 19:34:18 -07:00 |
Baligh Uddin
|
3c163ec173
|
am ac68b5ce: am 4b8494c4: (-s ours) Import translations. DO NOT MERGE
* commit 'ac68b5cebf77a9411626a4ce7b77ab06ebe513e0':
Import translations. DO NOT MERGE
|
2013-04-10 19:34:17 -07:00 |
Baligh Uddin
|
8acb56b60b
|
am 128ab7e5: Import translations. DO NOT MERGE
* commit '128ab7e5e36e133169f649232a5193f35f9932ca':
Import translations. DO NOT MERGE
|
2013-04-10 19:34:14 -07:00 |
Satoshi Kataoka
|
a2b129e9ae
|
am 0b0d9827: am 95fe8267: Move suggest logic to AOSP
* commit '0b0d9827a01b50d4bbe01ecfa2d42a27dc5069e9':
Move suggest logic to AOSP
|
2013-04-10 19:34:13 -07:00 |
Jean-Baptiste Queru
|
d9f35e3226
|
am a21bec13: am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge
* commit 'a21bec13357c02f5964e93aaec444f620bf83f60':
|
2013-04-10 19:34:12 -07:00 |
Kurt Partridge
|
94c441a424
|
am cdaee868: Merge "Preserve a class for testing"
* commit 'cdaee868a3a7b49911ff52aa530076a44dcbb299':
Preserve a class for testing
|
2013-04-10 16:47:53 -07:00 |
Kurt Partridge
|
cdaee868a3
|
Merge "Preserve a class for testing"
|
2013-04-10 23:45:33 +00:00 |
Kurt Partridge
|
3684036eed
|
Preserve a class for testing
Addresses b/8583091
Change-Id: I89605223784312d9572dfc7c8aaa7e5eba44c4f6
|
2013-04-10 16:40:17 -07:00 |
Tom Ouyang
|
f08c75f20c
|
am fd9f3d97: Add ability to handle digraphs in gesture and tap typing
* commit 'fd9f3d97aee97e9d2e5b9016ec61e120c1265b6a':
Add ability to handle digraphs in gesture and tap typing
|
2013-04-10 16:03:42 -07:00 |
Tom Ouyang
|
38a9e5a5bf
|
am b6e1777d: Merge "Add mechanism to handle digraphs in DicNode"
* commit 'b6e1777d4b78fd425f1960299fd28a685c41aaeb':
Add mechanism to handle digraphs in DicNode
|
2013-04-10 15:55:22 -07:00 |