Satoshi Kataoka
|
793763268e
|
am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit 'f555b25503c4628c90f19ae3bd8684aaede3b335':
|
2013-04-03 19:28:21 -07:00 |
Baligh Uddin
|
307d2aa218
|
am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit '8e48a61891f274aa791469b0ae92ae5eb2a430c7':
|
2013-04-03 19:28:20 -07:00 |
|
Satoshi Kataoka
|
9f419592ff
|
am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit 'c3c1b4db786a379345209ac0046ec1b5cab55d0c':
|
2013-04-03 19:28:18 -07:00 |
Tadashi G. Takaoka
|
c61393c8ef
|
am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit '56642281573a89d96f13f1861ffbd7461f870079':
|
2013-04-03 19:28:17 -07:00 |
The Android Open Source Project
|
5517262476
|
am b2c2ce31: (-s ours) 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 'b2c2ce310cdb3218b5198f4135a8dfac0d9c14cb':
|
2013-04-03 19:28:15 -07:00 |
Alan Viverette
|
046a311a13
|
am d19c71d9: 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 'd19c71d98432f57b2c84d5741b8f2f27cb1b1f28':
|
2013-04-03 19:28:14 -07:00 |
Jean Chalard
|
dee08de2c5
|
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 '724ff2980d429e62557df73d588be2d678175716':
|
2013-04-03 19:28:13 -07:00 |
|
Jean Chalard
|
2cb50a05cd
|
am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
* commit '93465ea3bbf1a24df861f0fd599e02df1775dfb7':
|
2013-04-03 19:28:12 -07:00 |
|
Baligh Uddin
|
e7edb56174
|
am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit '1368eeee15a7d1378139baec9e085b25fe32039c':
|
2013-04-03 19:28:10 -07:00 |
|
Baligh Uddin
|
781195f438
|
am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
* commit '119eaf7a2742504fbaac65665e5c3a64fcfe5339':
|
2013-04-03 19:28:09 -07:00 |
|
Baligh Uddin
|
41db26ed18
|
am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
* commit '68889f1c3485b2eb2404e34f2da9df350700363e':
|
2013-04-03 19:28:08 -07:00 |
|
Satoshi Kataoka
|
e3c0cca463
|
am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
* commit 'e8a3e96447e367714d0ea8c91907573e0694c168':
|
2013-04-03 19:28:07 -07:00 |
|
Satoshi Kataoka
|
d6f56350fc
|
am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
* commit '619d1f73d4eda2c235fe45ac9fa1441719545f3e':
|
2013-04-03 19:28:05 -07:00 |
Kurt Partridge
|
3012c891ba
|
am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
* commit '867b2380b97e379c34db3e76a7eaf0521ebbe12c':
|
2013-04-03 19:28:04 -07:00 |
|
The Android Open Source Project
|
e72a088fe2
|
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 'a6dcb55eabfdfe68699a91b5bbf26616dd569b8f':
|
2013-04-03 19:28:03 -07:00 |
|
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 |
|
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 |
|
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 |