dbb90d08b5
am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit 'bd7b4fcce0ddf5bca612bcf275e073ddfd49b205':
Clean up InflateException reference from KeyboardBuilder
2013-03-27 21:44:59 -07:00
210226c559
am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '54f0ae278b49eb1d1147cdabc3c391fb5c4f869b':
2013-03-27 21:44:58 -07:00
9ecac40d85
am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '4f11af0c783718f3b899d1ccb15f9ddfd9ba1070':
2013-03-27 21:44:57 -07:00
2f73105a86
am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
...
* commit 'db5e07f75633ee89631bd6903378884b84bc1242':
[DO NOT MERGE] Increase string limits
2013-03-27 21:06:15 -07:00
db5e07f756
Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
2013-03-28 04:04:28 +00:00
830cd7b915
[DO NOT MERGE] Increase string limits
...
These have been requested by the translators. For some reason the limits
were shorter than the actual source strings. Both these messages are
meant to be displayed alone on the screen, and 50 chars should fit
comfortably.
Bug: 8442366
Bug: 8442144
Change-Id: I7845f85ddee992313f658e0268d090eae73778b3
2013-03-28 13:01:41 +09:00
c57cf2b776
am 841e6016: Import translations. DO NOT MERGE
...
* commit '841e60163b6b1452f37d8731d98a30923c6099b7':
Import translations. DO NOT MERGE
2013-03-27 14:48:30 -07:00
841e60163b
Import translations. DO NOT MERGE
...
Change-Id: I7ddec7dead61077b9972ca3a661571c096650bec
Auto-generated-cl: translation import
2013-03-27 12:32:41 -07:00
0ed901ff17
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I6f4f70c6f405f6f6703c2a063475714ad48462d7
2013-03-26 10:49:49 -07:00
1a334048ab
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-26 05:56:25 -07:00
ff41125b74
am fba54597: Import translations. DO NOT MERGE
...
* commit 'fba545975020525c0017bde8424db28dd21d5186':
Import translations. DO NOT MERGE
2013-03-25 22:52:36 +00:00
fba5459750
Import translations. DO NOT MERGE
...
Change-Id: I502c6b5a38d4495774179eb587775e713d5c98c9
Auto-generated-cl: translation import
2013-03-25 15:38:08 -07:00
eaded6bdd8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-25 05:56:44 -07:00
7668deece8
am 21160c4e: Import translations. DO NOT MERGE
...
* commit '21160c4eba74344a583cae423b1909483559c87f':
Import translations. DO NOT MERGE
2013-03-23 01:47:46 +00:00
21160c4eba
Import translations. DO NOT MERGE
...
Change-Id: I7531241854018cd052606f7f4a9b82fccd2e725c
Auto-generated-cl: translation import
2013-03-22 13:31:54 -07:00
74089a0946
am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
...
* commit 'ba0e497a0c53ae2a64c070544f6a6f0495442343': (126 commits)
am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
Support feedback
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
[FileEncap9] Extract ResearchLogDirectory class
[Lazy2] Pass a runnable to abort
[Lazy1] Switch to blocking log closures
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
[Lazy4] Remove useless debug code
[FileEncap8] Remove useless "success" variable
[FileEncap7] Extract uploadContents method
[FileEncap6] Extract Uploader class
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
[FileEncap5] Move conditional logic to caller
[FileEncap4] Simplify logic
[FileEncap3] Extract isUploadingUnconditionally method
...
2013-03-22 04:59:59 +00:00
ba0e497a0c
Merge commit '525bbec9eccbf5bd4581c2b9908e46f61c4431ad' into jb-mr2-dev
2013-03-21 21:52:17 -07:00
bd7b4fcce0
am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit 'ee91bde16c34af80201efb5f8d056caecbbbf338':
Clean up InflateException reference from KeyboardBuilder
2013-03-20 23:19:17 -07:00
ee91bde16c
Clean up InflateException reference from KeyboardBuilder
...
Change-Id: If9daa00b6d829ce2069a027e4bfec310ec108615
2013-03-21 12:27:33 +09:00
54f0ae278b
am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'a6fae701e344fcfda01b835c762855140d2de7e9':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-20 09:48:39 -07:00
a6fae701e3
am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '0849a4b9b7dc4e37993ca59cab1db8b43f0d456c':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-20 16:46:50 +00:00
0849a4b9b7
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I6854ee735b15189c2987281e5f0525687dcb3b21
2013-03-20 09:32:58 -07:00
525bbec9ec
am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-20 04:24:19 +00:00
897af93ff6
Prevent keyboard A11y proxy from referencing a null keyboard view.
...
Bug: 8402674
Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
2013-03-19 17:08:52 -07:00
4f11af0c78
am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-19 17:02:14 -07:00
9da7fa0f50
am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit '559616fb0c39e2f0bacdf294b84ba16ad1e8f371':
Prevent keyboard A11y proxy from referencing a null keyboard view.
2013-03-19 23:59:56 +00:00
559616fb0c
Prevent keyboard A11y proxy from referencing a null keyboard view.
...
Bug: 8402674
Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
2013-03-19 13:17:42 -07:00
44346c3549
merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
2013-03-19 15:55:42 +00:00
c1125b6dd1
am a462cd80: Support feedback
...
* commit 'a462cd80ae9d07cea596c61c54d7b1b2ba6c6645':
Support feedback
2013-03-19 01:30:29 -07:00
a462cd80ae
Support feedback
...
Bug: 8143554
Change-Id: If0a6bafc94da040f97f27c6d046fb58bed9fd615
2013-03-19 17:25:55 +09:00
458f56b679
am 8e005f29: am 1061bfdb: Break dependencies to allow offdevice tests to build
...
* commit '8e005f2989de98cd284f1f5210f4c9d8d658e5e7':
Break dependencies to allow offdevice tests to build
2013-03-19 01:15:13 -07:00
3c5b7d4814
am 6d90a10a: am 0cc0544a: Merge the dictionary pack in Latin IME.
...
* commit '6d90a10a343723b8613fd22d323c586ecc33b284':
Merge the dictionary pack in Latin IME.
2013-03-19 01:15:12 -07:00
8e005f2989
am 1061bfdb: Break dependencies to allow offdevice tests to build
...
* commit '1061bfdb34bbcb63bf0046eec42313d264ac33fa':
Break dependencies to allow offdevice tests to build
2013-03-19 08:12:50 +00:00
6d90a10a34
am 0cc0544a: Merge the dictionary pack in Latin IME.
...
* commit '0cc0544a2995c7eb54a830ae54db60af89d4073d':
Merge the dictionary pack in Latin IME.
2013-03-19 08:12:49 +00:00
1061bfdb34
Break dependencies to allow offdevice tests to build
...
Change-Id: Ia9a2e8f0672b3f72943f26fb15de1d3c7c5ce7f1
2013-03-19 16:45:25 +09:00
0cc0544a29
Merge the dictionary pack in Latin IME.
...
Bug: 8161354
Change-Id: I17c23f56dd3bc2f27726556bf2c5a9d5520bd172
2013-03-19 15:40:14 +09:00
3b93f0e9a7
am 841c295f: resolved conflicts for merge of 5b048292 to master
...
* commit '841c295f3c99214f45924434d9c0bb5b4760578d':
Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
2013-03-18 18:55:25 -07:00
841c295f3c
resolved conflicts for merge of 5b048292 to master
...
Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
2013-03-19 10:48:10 +09:00
5b04829254
Merge "Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS" into jb-mr2-dev
2013-03-19 00:33:13 +00:00
68c09b56bf
am bbadc6ed: (-s ours) am 20591e43: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bbadc6ed2f8a74214bcc328c7b4d7f9bb55d6ef0':
Import translations. DO NOT MERGE
2013-03-18 16:43:18 -07:00
bbadc6ed2f
am 20591e43: (-s ours) Import translations. DO NOT MERGE
...
* commit '20591e43c42d953de1fa474670a70a10a819f60f':
Import translations. DO NOT MERGE
2013-03-18 23:40:56 +00:00
20c6a91447
am c542a588: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c542a5882efde7b15a7278041c15a93c4d577ca9':
Import translations. DO NOT MERGE
2013-03-18 16:37:44 -07:00
c542a5882e
Import translations. DO NOT MERGE
...
Change-Id: Ie70585ed9a13c8f17b8744664bee6ab7eb511c36
Auto-generated-cl: translation import
2013-03-18 13:28:15 -07:00
0f1527df0d
Import translations. DO NOT MERGE
...
Change-Id: I26d82ea1465ff4a7617b0cd5a94bb6a8c1b8df76
Auto-generated-cl: translation import
2013-03-18 13:23:28 -07:00
2ffdb07845
Import translations. DO NOT MERGE
...
Change-Id: Ibb8964f1f799c3279460df23124ae8ec866ea873
Auto-generated-cl: translation import
2013-03-18 13:22:51 -07:00
20591e43c4
Import translations. DO NOT MERGE
...
Change-Id: I0400e547eb41b707eeb8284bd96463068baab957
Auto-generated-cl: translation import
2013-03-18 13:22:00 -07:00
9c3860ce46
Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
...
bug: 8393568
Change-Id: Ie5edf44a3627aca9416145aff56bf05bbf2a05f3
2013-03-18 23:15:47 +09:00
df6e492351
am f8325ec4: am 5cb0560b: Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev
...
* commit 'f8325ec4bb83f91d53949562556652bff315f088':
Access the dictionary pack only if have INTERNET permission
2013-03-18 04:10:36 -07:00
f8325ec4bb
am 5cb0560b: Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev
...
* commit '5cb0560b000f37b3fb3937f01b6d3e928afef57a':
Access the dictionary pack only if have INTERNET permission
2013-03-18 11:08:52 +00:00
5cb0560b00
Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev
2013-03-18 11:04:53 +00:00
Tadashi G. Takaoka
The Android Open Source Project
Alan Viverette
Jean Chalard
Baligh Uddin
The Android Automerger
Satoshi Kataoka
Ken Wakasa