Scott Main
6dbfed2f8a
Merge "Fix typo"
2012-11-19 10:26:42 -08:00
Satoshi Kataoka
1ee199a4c6
am 9371747e: am 0e1c092a: am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
...
* commit '9371747e752236727be58149a8d04248860c134f':
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
2012-11-17 22:01:57 -08:00
Satoshi Kataoka
9371747e75
am 0e1c092a: am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
...
* commit '0e1c092ab0ee0f2f499dba2bc51223e106f51964':
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
2012-11-17 21:59:18 -08:00
Satoshi Kataoka
0e1c092ab0
am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
...
* commit '2656abe09895088eca25caafc3e92869217d1447':
Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
2012-11-17 21:56:09 -08:00
Satoshi Kataoka
2656abe098
Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev
2012-11-17 21:53:10 -08:00
Baligh Uddin
ee16821464
am 3e932c45: (-s ours) am 0c78d9ef: am e007c0e8: am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '3e932c45c6ed698a44b73bc1b06a1bca07205e14':
Import translations. DO NOT MERGE
2012-11-16 17:59:25 -08:00
Baligh Uddin
3e932c45c6
am 0c78d9ef: am e007c0e8: am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '0c78d9eff8d4f1398759024f9e3c56fa28111fc8':
Import translations. DO NOT MERGE
2012-11-16 17:56:30 -08:00
Baligh Uddin
d8d1b05e4a
am e4a2c2e3: (-s ours) am 8b658253: am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit 'e4a2c2e37f94050499f5b5411980fac4d074cce1':
Import translations. DO NOT MERGE
2012-11-16 17:54:41 -08:00
Baligh Uddin
0c78d9eff8
am e007c0e8: am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e007c0e8bc306f13149e6e099753cd110da1ec8c':
Import translations. DO NOT MERGE
2012-11-16 17:53:35 -08:00
Baligh Uddin
e4a2c2e37f
am 8b658253: am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '8b658253361971b920ebc7faaed96dec91dbb731':
Import translations. DO NOT MERGE
2012-11-16 17:51:49 -08:00
Baligh Uddin
e007c0e8bc
am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'bd7ff05e65113cd6fa5b7e0df9c7023e8cd60ac0':
Import translations. DO NOT MERGE
2012-11-16 17:50:13 -08:00
Baligh Uddin
8b65825336
am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '50a8911628a27fbbac678dd679aaafadceb65bee':
Import translations. DO NOT MERGE
2012-11-16 17:48:52 -08:00
Baligh Uddin
00c78c2383
am 706c6613: (-s ours) am 8b024af2: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '706c661348c6c904e6e9c22f2bbd996dfdd2b424':
Import translations. DO NOT MERGE
2012-11-16 17:47:45 -08:00
Baligh Uddin
26c9c7e124
am 12b83163: (-s ours) am b184a168: am 7e5fc453: am 9d45abd4: Import translations. DO NOT MERGE
...
* commit '12b83163faa2815a762669b285ed7e223f40286a':
Import translations. DO NOT MERGE
2012-11-16 17:47:41 -08:00
Baligh Uddin
8f6bf733cf
am 4492cd96: (-s ours) am 75d66ffe: am 3a3a84e4: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '4492cd965df364306e4d99939fc7aaf2f2a1c6d7':
Import translations. DO NOT MERGE
2012-11-16 17:47:32 -08:00
Baligh Uddin
d931f14c9d
Merge "Import translations. DO NOT MERGE"
2012-11-16 17:46:36 -08:00
Baligh Uddin
50a8911628
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-11-16 17:45:34 -08:00
Baligh Uddin
706c661348
am 8b024af2: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '8b024af2a4490e2e8c83955dd61b455e02921182':
Import translations. DO NOT MERGE
2012-11-16 17:44:01 -08:00
Baligh Uddin
12b83163fa
am b184a168: am 7e5fc453: am 9d45abd4: Import translations. DO NOT MERGE
...
* commit 'b184a168150b7eda7bc4e691c1f68a0185fcbcc8':
Import translations. DO NOT MERGE
2012-11-16 17:43:58 -08:00
Baligh Uddin
bd7ff05e65
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-11-16 17:43:56 -08:00
Baligh Uddin
4492cd965d
am 75d66ffe: am 3a3a84e4: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '75d66ffe82a83f90a033c3e7b1f15a67014122cd':
Import translations. DO NOT MERGE
2012-11-16 17:43:55 -08:00
Baligh Uddin
8b024af2a4
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-16 17:42:20 -08:00
Baligh Uddin
e1d23d3d2c
am 0505b8bf: (-s ours) am 17936f01: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '0505b8bfab86ce53212e9402e55da4dc243e6d4b':
Import translations. DO NOT MERGE
2012-11-16 17:41:43 -08:00
Baligh Uddin
b184a16815
am 7e5fc453: am 9d45abd4: Import translations. DO NOT MERGE
...
* commit '7e5fc45320992d1f7063c1936662d48fde2e00f8':
Import translations. DO NOT MERGE
2012-11-16 17:40:57 -08:00
Baligh Uddin
75d66ffe82
am 3a3a84e4: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
...
* commit '3a3a84e4d6e507102ab52df9562191bbb98f4a88':
Import translations. DO NOT MERGE
2012-11-16 17:40:54 -08:00
Baligh Uddin
7e5fc45320
am 9d45abd4: Import translations. DO NOT MERGE
...
* commit '9d45abd4aa761af65e27eb2300b50f35526a4b61':
Import translations. DO NOT MERGE
2012-11-16 17:39:20 -08:00
Baligh Uddin
dd6073bab8
Merge "Import translations. DO NOT MERGE"
2012-11-16 17:39:19 -08:00
Baligh Uddin
0505b8bfab
am 17936f01: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
...
* commit '17936f0187d4f410a54d32cdc1915e38227d95a0':
Import translations. DO NOT MERGE
2012-11-16 17:38:10 -08:00
Baligh Uddin
3a3a84e4d6
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
2012-11-16 17:38:07 -08:00
Baligh Uddin
17936f0187
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-11-16 17:35:08 -08:00
Fabrice Di Meglio
f18feecee4
am 62107ce4: am 13fbac66: am 1f33e642: Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev
...
* commit '62107ce46c862fff2ee024862164b588400a6343':
Fix keyguard pin/simpin/simpuk RTL-ization
2012-11-16 16:45:26 -08:00
Fabrice Di Meglio
62107ce46c
am 13fbac66: am 1f33e642: Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev
...
* commit '13fbac66314322740703006be23a55e581e21fcf':
Fix keyguard pin/simpin/simpuk RTL-ization
2012-11-16 16:42:26 -08:00
Fabrice Di Meglio
13fbac6631
am 1f33e642: Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev
...
* commit '1f33e6422ea80d6caba44dd05403b137c219938a':
Fix keyguard pin/simpin/simpuk RTL-ization
2012-11-16 16:38:55 -08:00
Fabrice Di Meglio
1f33e6422e
Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev
2012-11-16 16:36:00 -08:00
Michael Jurka
3a22636222
am 3366a5d5: am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
...
* commit '3366a5d54eccbbe861bcc765653664d80eae5398':
Delete appWidgetId when removing lockscreen widgets
2012-11-16 15:37:08 -08:00
Michael Jurka
3366a5d54e
am cf474b1a: am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
...
* commit 'cf474b1a10a1349d0d6d6f7cbb5d48489bacfb09':
Delete appWidgetId when removing lockscreen widgets
2012-11-16 15:34:20 -08:00
Michael Jurka
cf474b1a10
am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
...
* commit '7b0c877959ee15c766cc7366ec6b4c024c211cd6':
Delete appWidgetId when removing lockscreen widgets
2012-11-16 15:31:07 -08:00
Michael Jurka
7b0c877959
Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev
2012-11-16 15:29:17 -08:00
Michael Jurka
75b5cfb4a4
Delete appWidgetId when removing lockscreen widgets
...
Bug: 7550012
Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
2012-11-16 15:22:06 -08:00
Jim Miller
05163aa3d5
Fix keyguard pin/simpin/simpuk RTL-ization
...
This fixes the PIN, SIM PIN, and SIM PUK keyboards to keep the keys in the same
position for all languages.
Fixes bug 7538528
Change-Id: Ib07e89e9496e6c5b91c1bbda7781eddeddea0554
2012-11-16 14:56:57 -08:00
Guang Zhu
dc0b84b129
am e9019d90: am dbcdb1a8: am a9c0bb4a: Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev
...
* commit 'e9019d90a3eed0dae98d5502e386212e56a92267':
grant shell user EXPAND_STATUS_BAR permission
2012-11-16 14:13:48 -08:00
Baligh Uddin
aee5f66a24
Import translations. DO NOT MERGE
...
Change-Id: Ida159f6328acb737c078ac2e37b1a04dfce3acc8
Auto-generated-cl: translation import
2012-11-16 14:12:49 -08:00
Guang Zhu
e9019d90a3
am dbcdb1a8: am a9c0bb4a: Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev
...
* commit 'dbcdb1a854b155605fe69dc47b8f6e4e441c817d':
grant shell user EXPAND_STATUS_BAR permission
2012-11-16 14:12:19 -08:00
Baligh Uddin
f3cd8e5e38
Import translations. DO NOT MERGE
...
Change-Id: I8fdaf22a9c0ab1552d379501f7fde119064d49b8
Auto-generated-cl: translation import
2012-11-16 14:11:16 -08:00
Baligh Uddin
af673f894b
Import translations. DO NOT MERGE
...
Change-Id: I8b0789aa1a67fba819a5f2b87373e9ab5fa3f59d
Auto-generated-cl: translation import
2012-11-16 14:10:37 -08:00
Baligh Uddin
d98dcb457a
Import translations. DO NOT MERGE
...
Change-Id: Ia5d5f55b872c065f39ad7e86c62e049e547a74c8
Auto-generated-cl: translation import
2012-11-16 14:09:54 -08:00
Guang Zhu
dbcdb1a854
am a9c0bb4a: Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev
...
* commit 'a9c0bb4a579a98cb7694e36454425c84a8c6510e':
grant shell user EXPAND_STATUS_BAR permission
2012-11-16 14:09:47 -08:00
Guang Zhu
a9c0bb4a57
Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev
2012-11-16 14:06:01 -08:00
Baligh Uddin
640b4e3375
Import translations. DO NOT MERGE
...
Change-Id: I9520d2f1f2215616a49322d25111f9300edb20b1
Auto-generated-cl: translation import
2012-11-16 14:00:53 -08:00
Baligh Uddin
116133a2a6
Import translations. DO NOT MERGE
...
Change-Id: I8187a141a3949c9c1678912b13267b21398a6c5e
Auto-generated-cl: translation import
2012-11-16 13:51:42 -08:00
