Commit Graph

6528 Commits (48d8d8d0ae573605f938b3859bf58e1972f0d737)

Author SHA1 Message Date
Baligh Uddin a3e47f8780 am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit '74089a0946fa804e13497931a1c15e94a445f6ad': (93 commits)
  am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...
2013-03-22 05:01:10 +00:00
Satoshi Kataoka c1c3e03c12 am 140b6705: Merge "Fix appname"
* commit '140b6705ece0559f2ea9647044b3baf6a314f3d3':
  Fix appname
2013-03-21 20:45:30 -07:00
Satoshi Kataoka 140b6705ec Merge "Fix appname" 2013-03-22 03:42:54 +00:00
Satoshi Kataoka 4f6804e5b4 Fix appname
Bug: 6789579
Change-Id: I224bd1b734f74db31c006601129339c099616ed6
2013-03-22 11:54:35 +09:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka ee91bde16c Clean up InflateException reference from KeyboardBuilder
Change-Id: If9daa00b6d829ce2069a027e4bfec310ec108615
2013-03-21 12:27:33 +09:00
Alan Viverette 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
Alan Viverette 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
Alan Viverette 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
Alan Viverette 559616fb0c Prevent keyboard A11y proxy from referencing a null keyboard view.
Bug: 8402674
Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
2013-03-19 13:17:42 -07:00
Satoshi Kataoka c1125b6dd1 am a462cd80: Support feedback
* commit 'a462cd80ae9d07cea596c61c54d7b1b2ba6c6645':
  Support feedback
2013-03-19 01:30:29 -07:00
Satoshi Kataoka a462cd80ae Support feedback
Bug: 8143554
Change-Id: If0a6bafc94da040f97f27c6d046fb58bed9fd615
2013-03-19 17:25:55 +09:00
Jean Chalard 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
Jean Chalard 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
Jean Chalard 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
Jean Chalard 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
Jean Chalard 1061bfdb34 Break dependencies to allow offdevice tests to build
Change-Id: Ia9a2e8f0672b3f72943f26fb15de1d3c7c5ce7f1
2013-03-19 16:45:25 +09:00
Jean Chalard 0cc0544a29 Merge the dictionary pack in Latin IME.
Bug: 8161354
Change-Id: I17c23f56dd3bc2f27726556bf2c5a9d5520bd172
2013-03-19 15:40:14 +09:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 841c295f3c resolved conflicts for merge of 5b048292 to master
Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
2013-03-19 10:48:10 +09:00
Ken Wakasa 5b04829254 Merge "Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS" into jb-mr2-dev 2013-03-19 00:33:13 +00:00
Baligh Uddin c542a5882e Import translations. DO NOT MERGE
Change-Id: Ie70585ed9a13c8f17b8744664bee6ab7eb511c36
Auto-generated-cl: translation import
2013-03-18 13:28:15 -07:00
Baligh Uddin 2ffdb07845 Import translations. DO NOT MERGE
Change-Id: Ibb8964f1f799c3279460df23124ae8ec866ea873
Auto-generated-cl: translation import
2013-03-18 13:22:51 -07:00
Baligh Uddin 20591e43c4 Import translations. DO NOT MERGE
Change-Id: I0400e547eb41b707eeb8284bd96463068baab957
Auto-generated-cl: translation import
2013-03-18 13:22:00 -07:00
Ken Wakasa 9c3860ce46 Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
bug: 8393568
Change-Id: Ie5edf44a3627aca9416145aff56bf05bbf2a05f3
2013-03-18 23:15:47 +09:00
Jean Chalard 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
Jean Chalard 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
Jean Chalard 5cb0560b00 Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev 2013-03-18 11:04:53 +00:00
Jean Chalard ce487bcf33 Access the dictionary pack only if have INTERNET permission
Bug: 8161354
Change-Id: I68ee3acb2955a017d25666cc2dad791798f9064a
2013-03-18 18:40:33 +09:00
Satoshi Kataoka bbaf50f275 am 62ed594c: am e0e67373: Refactor parameters by naming convention
* commit '62ed594c373e172ba7b32d099911b318dcbfc7b2':
  Refactor parameters by naming convention
2013-03-17 23:48:25 -07:00
Satoshi Kataoka 62ed594c37 am e0e67373: Refactor parameters by naming convention
* commit 'e0e67373735918c78eaeaf24f127e1d28816aa29':
  Refactor parameters by naming convention
2013-03-18 06:47:10 +00:00
Satoshi Kataoka e0e6737373 Refactor parameters by naming convention
Change-Id: I8bda8075b33f656ecbec08320afcd864b620fe77
2013-03-18 15:42:15 +09:00
Tadashi G. Takaoka a75ada5000 am 3268a44e: am a5067333: Disable the header list of DebugSettingsActivity
* commit '3268a44e1cde2f4e14d01ac62e2e1a6e9a70a601':
  Disable the header list of DebugSettingsActivity
2013-03-15 00:10:53 -07:00
Tadashi G. Takaoka 3268a44e1c am a5067333: Disable the header list of DebugSettingsActivity
* commit 'a50673330e012f6cca02b83eca1c047b8da319e0':
  Disable the header list of DebugSettingsActivity
2013-03-15 07:10:00 +00:00
Tadashi G. Takaoka a50673330e Disable the header list of DebugSettingsActivity
This change addresses the issue that the debug settings on 10-inch
tablet doesn't show up.

Change-Id: I60540cf21276869a3ca81b7b0154056ce7d93ff1
2013-03-15 15:33:27 +09:00
Kurt Partridge ec981aa963 am f33f1cab: [FileEncap9] Extract ResearchLogDirectory class
* commit 'f33f1cab2fd57fe39955593e68902554ed57a053':
  [FileEncap9] Extract ResearchLogDirectory class
2013-03-14 09:01:42 -07:00
Kurt Partridge f33f1cab2f [FileEncap9] Extract ResearchLogDirectory class
Previously used a monotonically increasing int.  Now uses uuid and nanoseconds.

squashed in:
    [FileEncap11] Read preference from ResearchSettings
    Change-Id: Ic779e0a69db6b16e92c6f4b63dbe7b7add566ab6

    [FileEncap12] Simplify directory cleanup invocation
    Change-Id: I688047409c0343d32b11447fb625dfb726c731ec

    [FileEncap14] Change log filename syntax
    Change-Id: I9243b20b2eb392f81ab8c5c3d19315211240e0bc

Change-Id: I5c9d70e0cb7b0965158e17dd71dfab796bd9a440
2013-03-14 06:37:56 -07:00
Kurt Partridge 60f565caab am 7faa2caa: Merge "[Lazy4] Remove useless debug code"
* commit '7faa2caa80ea3b07ab317a5aa92bd048b574af27':
  [Lazy4] Remove useless debug code
2013-03-14 06:16:16 -07:00
Kurt Partridge 7faa2caa80 Merge "[Lazy4] Remove useless debug code" 2013-03-14 13:13:57 +00:00
Baligh Uddin 95e09ea7b8 Merge "Import translations. DO NOT MERGE" 2013-03-14 05:19:07 +00:00
Baligh Uddin 01f188a781 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-03-14 05:15:42 +00:00
Baligh Uddin 620be98feb Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-14 05:15:13 +00:00
Tadashi G. Takaoka 5e04234784 am fb606c62: am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev
* commit 'fb606c6277fdf7385bf8ce876102bda016465e8f':
  Clean up StaticInnerHandlerWrapper a bit
2013-03-13 20:45:44 -07:00
Tadashi G. Takaoka fb606c6277 am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev
* commit 'f0864b1d95411ce9886a5ade13f42cb17f578828':
  Clean up StaticInnerHandlerWrapper a bit
2013-03-14 03:44:00 +00:00
Tadashi G. Takaoka 3153863f04 am 1ab33383: am 0d5f214a: Fix NPE found in monkey test
* commit '1ab33383f983082621084a65a168101e5fb526e0':
  Fix NPE found in monkey test
2013-03-13 20:41:31 -07:00
Tadashi G. Takaoka f0864b1d95 Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev 2013-03-14 03:41:01 +00:00
Tadashi G. Takaoka 1ab33383f9 am 0d5f214a: Fix NPE found in monkey test
* commit '0d5f214aa774ab0ab7c17521984caae11c9f4c2b':
  Fix NPE found in monkey test
2013-03-14 03:39:38 +00:00
Tadashi G. Takaoka 41e60bf6dd Clean up StaticInnerHandlerWrapper a bit
Change-Id: Ib07efe6da1eb2f0fd9ef68ca71502c98f7e19f4b
2013-03-14 12:35:47 +09:00
Tadashi G. Takaoka 0d5f214aa7 Fix NPE found in monkey test
Bug: 8383127
Change-Id: Ifd70acabe118b477f103937c7f1e99e38e210833
2013-03-14 12:19:10 +09:00
Tadashi G. Takaoka fc00d2bfbe am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
* commit 'f5caf5be994f8b7885f4e434e25019fd847ca927':
  Move checking non-persistent checkbox to onResume
2013-03-13 19:38:47 -07:00
Tadashi G. Takaoka f5caf5be99 am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
* commit '601a8582d0f761a85b6eb16e7a6b78402f6f2599':
  Move checking non-persistent checkbox to onResume
2013-03-14 02:33:28 +00:00
Satoshi Kataoka cb8ed32be5 am 0b251201: am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev
* commit '0b2512017edb0161d51643560cd41dac9b1a1559':
  Make isInternal mutable
2013-03-13 10:27:12 -07:00
Satoshi Kataoka 0b2512017e am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev
* commit '0ab44b21bd6ef5e9fde329b25dfd84f6ca5c0825':
  Make isInternal mutable
2013-03-13 17:24:49 +00:00
Kurt Partridge f6d68ee385 am 64b95965: Merge "[Lazy2] Pass a runnable to abort"
* commit '64b9596544acbeec1a416185e9472cfbd49cde60':
  [Lazy2] Pass a runnable to abort
2013-03-13 06:22:31 -07:00
Kurt Partridge 64b9596544 Merge "[Lazy2] Pass a runnable to abort" 2013-03-13 13:20:55 +00:00
Jean Chalard 8067b769f1 Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev 2013-03-13 10:55:04 +00:00
Tadashi G. Takaoka 601a8582d0 Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev 2013-03-13 07:52:35 +00:00
Satoshi Kataoka 0ab44b21bd Merge "Make isInternal mutable" into jb-mr2-dev 2013-03-13 07:41:11 +00:00
Satoshi Kataoka 756791e6bf Make isInternal mutable
Change-Id: Ib81ceba801be0ac7ef65c4eadd1ec8599e80dacc
2013-03-13 16:28:50 +09:00
Tadashi G. Takaoka 24cea7f1fb Move checking non-persistent checkbox to onResume
Bug: 8336068
Change-Id: I07e67a6aee24a239a21e6fc69eb2ec741b9a5b2b
2013-03-13 15:54:33 +09:00
Jean Chalard 13a82d9530 [Lazy2] Pass a runnable to abort
Change-Id: I721afbf426099753aa876a55323eb806b08c24d6
2013-03-12 18:56:57 -07:00
Kurt Partridge ee698210af am 5e75e15a: Merge "[Lazy1] Switch to blocking log closures"
* commit '5e75e15a95185a56c0bdd19d3efbe9de9e5775f9':
  [Lazy1] Switch to blocking log closures
2013-03-12 17:20:36 -07:00
Kurt Partridge 5e75e15a95 Merge "[Lazy1] Switch to blocking log closures" 2013-03-13 00:18:02 +00:00
Jean Chalard 7423005b96 [Lazy1] Switch to blocking log closures
Change-Id: I4daec20b7b47b0d71c5aab6e17cd660015e19e71
2013-03-12 17:09:08 -07:00
Baligh Uddin df601fd0d1 Import translations. DO NOT MERGE
Change-Id: I16ec93523721a344e1a09b5242400fe719d07516
Auto-generated-cl: translation import
2013-03-12 13:14:01 -07:00
Baligh Uddin 7f0aaaef7c Import translations. DO NOT MERGE
Change-Id: Idf34e25ce4d5c162955b70c53c105f87486a7ff6
Auto-generated-cl: translation import
2013-03-12 13:08:49 -07:00
Baligh Uddin e1720957b5 Import translations. DO NOT MERGE
Change-Id: I478c5e0ec19d0d1f1835826606f7736059e7795c
Auto-generated-cl: translation import
2013-03-12 13:07:57 -07:00
Tadashi G. Takaoka 1b985607cc am dbfd2825: am 2bbd3065: Language dependent single/doule quotation more keys
* commit 'dbfd2825c8bc46d64ac2752aa04c23ab385fbbac':
  Language dependent single/doule quotation more keys
2013-03-11 22:59:55 -07:00
Tadashi G. Takaoka dbfd2825c8 am 2bbd3065: Language dependent single/doule quotation more keys
* commit '2bbd3065d3bd9785ad1638c65f8c73f11bf21922':
  Language dependent single/doule quotation more keys
2013-03-12 05:57:30 +00:00
Tadashi G. Takaoka 2bbd3065d3 Language dependent single/doule quotation more keys
The natural way of marking quoted text vary from language to
language. This change introduces the following variations.

* LEFT and RIGHT quotations (English etc.)
* LOW-9 and LEFT quotations (German etc.)
* LOW-9 and RIGHT quotations (Dutch etc.)
* RIGHT and RIGHT quotations (Swedish etc.)
* LEFT ANGLE and RIGHT ANGLE quotations (French etc.)
* RIGHT ANGLE and LEFT ANGLE quotations

Bug: 8356419
Change-Id: I75726ab7ed783d02f189b46236c9d5079737bcff
2013-03-12 14:43:34 +09:00
Jean Chalard 92eaa6fc7c [DO NOT MERGE] Deactivate H/W keyboard handling
For MR2, LatinIME should not be handling hardware keyboard
events. The feature is still work in progress.

Change-Id: I56ff18bff84ba6b5a6bc3f8829b42eaf33b72554
2013-03-12 14:22:06 +09:00
Tadashi G. Takaoka 4660cf5c5b am d7b4af9b: am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev
* commit 'd7b4af9b560fb11ca0acb78ca937a0eeb06e147c':
  Add dotted circle to combination letter
2013-03-11 02:07:10 -07:00
Tadashi G. Takaoka d7b4af9b56 am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev
* commit '67e264de6b2367bc7522b51b1b3f52445e5dde6a':
  Add dotted circle to combination letter
2013-03-11 09:05:17 +00:00
Tadashi G. Takaoka 67e264de6b Merge "Add dotted circle to combination letter" into jb-mr2-dev 2013-03-11 09:01:19 +00:00
Tadashi G. Takaoka 0b928509c7 Add dotted circle to combination letter
This dotted circle (U+25CC) hack is needed to the device that runs API
version 14 and 15.  The device that runs API version 16 and 17 has an
issue to draw incomplete successive combining code points of Hindi.
The device that runs API version greater than 17 has no issue to draw
incomplete Hindi combining letters.

Bug: 6233945
Bug: 8344448
Change-Id: I22361da908ccca3ebad0beb32e7f69219e9160d6
2013-03-11 17:23:56 +09:00
Jean Chalard 220b271dfa [Lazy4] Remove useless debug code
This code is cluttering readability and getting in the way
of future updates.
Future updates will make it much easier to debug and to
test this code, so this needs to disappear.

Change-Id: I32e28ec608587b6b7c07250a2692b13e8fc98465
2013-03-08 17:46:00 -08:00
Svetoslav Ganov 9f555dcd5c am 2d9b7f60: am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev
* commit '2d9b7f60dd8c8dfdf89fd3a9eb41296a58df3a22':
  Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
2013-03-08 11:26:15 -08:00
Svetoslav Ganov 2d9b7f60dd am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev
* commit 'af37cbb44ef40fcd15fa02456c9abda8021847ce':
  Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
2013-03-08 19:24:25 +00:00
Svetoslav Ganov af37cbb44e Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev 2013-03-08 19:20:00 +00:00
Tadashi G. Takaoka e6db1b9bfd am 60906d4d: am 914d054e: Move logic of selecting key preview attribute to Key class
* commit '60906d4d08fdf4295c97ddfeacd61a06e7bc0f0c':
  Move logic of selecting key preview attribute to Key class
2013-03-08 03:25:24 -08:00
Tadashi G. Takaoka 60906d4d08 am 914d054e: Move logic of selecting key preview attribute to Key class
* commit '914d054ea26d18a1ba6a60f8c5e749136477bbf2':
  Move logic of selecting key preview attribute to Key class
2013-03-08 11:24:13 +00:00
Tadashi G. Takaoka 914d054ea2 Move logic of selecting key preview attribute to Key class
This change also fixes the size of a key preview letter to follow a
keyLabelFlags specification.

Change-Id: Ie13790788a16c5a053c1a2cbcac3d38314b14b7f
2013-03-08 19:44:22 +09:00
Kurt Partridge a515f3ef39 am bba39b9b: [FileEncap8] Remove useless "success" variable
* commit 'bba39b9b678f4fb00511ba88c12eef9082ecc628':
  [FileEncap8] Remove useless "success" variable
2013-03-07 19:57:34 -08:00
Kurt Partridge d9fe8049d4 am ee3261ff: [FileEncap7] Extract uploadContents method
* commit 'ee3261ff558ee734e15af5424f98bb8d8776795f':
  [FileEncap7] Extract uploadContents method
2013-03-07 19:13:56 -08:00
Kurt Partridge bba39b9b67 [FileEncap8] Remove useless "success" variable
Change-Id: Icf76bc0b795b6a9221d9a6d61c38df31af54ab7b
2013-03-07 17:43:35 -08:00
Kurt Partridge ee3261ff55 [FileEncap7] Extract uploadContents method
Change-Id: I018b2726533042dbcb25713ea039aec41c148db2
2013-03-07 17:43:28 -08:00
Kurt Partridge 0079d3abf4 am bca8348e: Merge "[FileEncap6] Extract Uploader class"
* commit 'bca8348e988170506c6c6ffc862f3377cf60dc8e':
  [FileEncap6] Extract Uploader class
2013-03-07 16:38:48 -08:00
Kurt Partridge bca8348e98 Merge "[FileEncap6] Extract Uploader class" 2013-03-08 00:37:14 +00:00
Kurt Partridge 4436446e9b [FileEncap6] Extract Uploader class
Gerrit was stuck on original change I9ef4eb7450

Change-Id: I6d4ee686944074779aca5b09b018782c7033874d
2013-03-07 16:19:44 -08:00
Alan Viverette c2ee72a214 Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
Bug: 8165295
Change-Id: Ie416f6cdb68377f3e06f30e9b6363c38ba2a602d
2013-03-07 10:39:55 -08:00
Baligh Uddin adfa9b9a94 Import translations. DO NOT MERGE
Change-Id: I363753d020e086f5a60abd84377afff7a4b280ea
Auto-generated-cl: translation import
2013-03-07 15:05:01 +00:00
Baligh Uddin 8a60ae01d3 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-03-07 05:27:29 +00:00
Kurt Partridge 26df5201cc am 41c471d9: Merge "[FileEncap5] Move conditional logic to caller"
* commit '41c471d93d117a65a4f241e588154d84709cf5d0':
  [FileEncap5] Move conditional logic to caller
2013-03-06 13:00:05 -08:00
Kurt Partridge 41c471d93d Merge "[FileEncap5] Move conditional logic to caller" 2013-03-06 20:59:04 +00:00
Baligh Uddin bc53c95720 Import translations. DO NOT MERGE
Change-Id: I715549b3e9bad6dd856883af8b6e828798921e38
Auto-generated-cl: translation import
2013-03-06 12:44:50 -08:00
Baligh Uddin 73dad2ad41 Import translations. DO NOT MERGE
Change-Id: I7cc086bac4494d1238ef6c5f9939a651100ee42d
Auto-generated-cl: translation import
2013-03-06 12:43:53 -08:00
Kurt Partridge be4e180fab am 1bc20700: Merge "[FileEncap4] Simplify logic"
* commit '1bc20700d594af28bb87575df4279b0bed624c52':
  [FileEncap4] Simplify logic
2013-03-06 12:06:44 -08:00
Kurt Partridge 1bc20700d5 Merge "[FileEncap4] Simplify logic" 2013-03-06 20:05:47 +00:00
Kurt Partridge 0d4c792316 am 719bb3aa: Merge "[FileEncap3] Extract isUploadingUnconditionally method"
* commit '719bb3aa39c6456b7d672258432d18ad917ba263':
  [FileEncap3] Extract isUploadingUnconditionally method
2013-03-06 11:16:00 -08:00
Kurt Partridge 719bb3aa39 Merge "[FileEncap3] Extract isUploadingUnconditionally method" 2013-03-06 19:14:52 +00:00