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
|
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 |
|
Baligh Uddin
|
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 |
|
Baligh Uddin
|
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 |
|
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
|
0f1527df0d
|
Import translations. DO NOT MERGE
Change-Id: I26d82ea1465ff4a7617b0cd5a94bb6a8c1b8df76
Auto-generated-cl: translation import
|
2013-03-18 13:23:28 -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
|
ba94873703
|
am 95e09ea7: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '95e09ea7b80c30139919d7b8fb6f38c90e6e081c':
Import translations. DO NOT MERGE
|
2013-03-13 22:21:14 -07:00 |
|
Baligh Uddin
|
afbc639053
|
am e563e585: (-s ours) am 620be98f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit 'e563e585d13c3f23518e73c1af5ca42de6f31778':
Import translations. DO NOT MERGE
|
2013-03-13 22:21:13 -07:00 |
|
Baligh Uddin
|
95e09ea7b8
|
Merge "Import translations. DO NOT MERGE"
|
2013-03-14 05:19:07 +00:00 |
|
Baligh Uddin
|
e563e585d1
|
am 620be98f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '620be98feb47f7dd66ce70cbdba2128737621fa3':
Import translations. DO NOT MERGE
|
2013-03-14 05:18:50 +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 |
|
Satoshi Kataoka
|
5a84bd1b22
|
am 3f46e8a8: am a38e14fd: Merge "Refactor skippable code point" into jb-mr2-dev
* commit '3f46e8a887a0ff6c59642d3ff68791a07574ea5c':
Refactor skippable code point
|
2013-03-13 19:38:49 -07:00 |
|
Jean Chalard
|
9984d1c7df
|
am 68e9f78b: (-s ours) am 8067b769: (-s ours) Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev
* commit '68e9f78b560b61a50e0e850c03e492730e51ed28':
[DO NOT MERGE] Deactivate H/W keyboard handling
|
2013-03-13 19:38:48 -07: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 |
|
Satoshi Kataoka
|
3f46e8a887
|
am a38e14fd: Merge "Refactor skippable code point" into jb-mr2-dev
* commit 'a38e14fd5597e9e483e7cf322c5b1490db45a754':
Refactor skippable code point
|
2013-03-14 02:33:33 +00:00 |
|
Jean Chalard
|
68e9f78b56
|
am 8067b769: (-s ours) Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev
* commit '8067b769f1229e447872f8b03df44b228a662561':
[DO NOT MERGE] Deactivate H/W keyboard handling
|
2013-03-14 02:33:29 +00: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 |
|
Satoshi Kataoka
|
a38e14fd55
|
Merge "Refactor skippable code point" into jb-mr2-dev
|
2013-03-13 13:01:48 +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 |
|
Satoshi Kataoka
|
cbb816d1b0
|
Refactor skippable code point
Change-Id: I5477b6e5d29d1f0b9c2fd5a495be77cf5f2fbaee
|
2013-03-13 19:04:16 +09:00 |
|