Baligh Uddin
85d0f81a89
am be790f34
: (-s ours) am 6c6d0738
: (-s ours) am 95fbce75
: (-s ours) am d0c1b8cb
: (-s ours) am 0f952752
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'be790f347a982d6165e186e87cfa051e95e36926':
Import translations. DO NOT MERGE
2013-12-27 04:06:51 +00:00
Baligh Uddin
be790f347a
am 6c6d0738
: (-s ours) am 95fbce75
: (-s ours) am d0c1b8cb
: (-s ours) am 0f952752
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6c6d073847c1c26861671e042a1916b3efcdf5d9':
Import translations. DO NOT MERGE
2013-12-27 04:04:22 +00:00
Baligh Uddin
6c6d073847
am 95fbce75
: (-s ours) am d0c1b8cb
: (-s ours) am 0f952752
: (-s ours) Import translations. DO NOT MERGE
...
* commit '95fbce75a7a3c4937c08b610965cc7d7e1aea403':
Import translations. DO NOT MERGE
2013-12-27 04:01:11 +00:00
Baligh Uddin
95fbce75a7
am d0c1b8cb
: (-s ours) am 0f952752
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd0c1b8cbee025b009261a5e9e3ae37e9cbb891ef':
Import translations. DO NOT MERGE
2013-12-26 19:57:05 -08:00
Baligh Uddin
d0c1b8cbee
am 0f952752
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0f952752e387cd4035193015ff3fa793164c980c':
Import translations. DO NOT MERGE
2013-12-26 19:51:27 -08:00
Baligh Uddin
63974a92c8
Import translations. DO NOT MERGE
...
Change-Id: I295b494750d386344faed16eb3f281dfac28bea2
Auto-generated-cl: translation import
2013-12-26 16:30:07 -08:00
Baligh Uddin
0f952752e3
Import translations. DO NOT MERGE
...
Change-Id: I4f4f30cdf374729ad15bd018d7ae6d926f8d6f1d
Auto-generated-cl: translation import
2013-12-26 16:26:39 -08:00
Alan Viverette
dd6513d969
Merge "Additional captioning fonts"
2013-12-20 00:41:02 +00:00
Alan Viverette
7f9781b559
Merge "Additional caption settings for edge styles and window color"
2013-12-20 00:40:53 +00:00
Dianne Hackborn
09a3c1f949
Merge "Update to follow BatteryStats."
2013-12-19 22:51:47 +00:00
Zhihai Xu
23d886f698
Merge "BLuetooth Discoverable timer not correctly cleared"
2013-12-19 21:49:50 +00:00
Kim Schulz
54313d7d66
BLuetooth Discoverable timer not correctly cleared
...
Changing the discoverable timer from 2min to infinity before the 2min timer
has passed will not clear the 2min timer.
This fix handles this case.
Bug: 12220031
Change-Id: I8794eda353c74e46b09e15ee9a7a491658e7b5cd
2013-12-19 13:45:11 -08:00
Dianne Hackborn
fb03058dc9
Update to follow BatteryStats.
...
Change data use to be based on packets instead of bytes.
Change-Id: I536dd2c2fc3fbeb12689e793f79e5fac984fe3af
2013-12-19 13:10:25 -08:00
Alan Viverette
d07c16107d
Additional caption settings for edge styles and window color
...
Change-Id: Ib967bc566a7b8f7674c696fc05d799e12269ec42
2013-12-19 11:31:36 -08:00
Alan Viverette
65a6ef6f34
Additional captioning fonts
...
Change-Id: Ib3298f65b602d581fa031576c3b9026bfd6a8672
2013-12-19 11:30:48 -08:00
Baligh Uddin
3f538cc3f8
am 0c70ceef
: (-s ours) am 5f4deba1
: (-s ours) am fb793cb9
: (-s ours) am 8c810a4e
: (-s ours) am 7ba72721
: (-s ours) Import translations. DO NOT MERGE
...
* commit '0c70ceef84fd53887facc655a9c7088267e2935b':
Import translations. DO NOT MERGE
2013-12-19 15:36:18 +00:00
Baligh Uddin
0c70ceef84
am 5f4deba1
: (-s ours) am fb793cb9
: (-s ours) am 8c810a4e
: (-s ours) am 7ba72721
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5f4deba185e4ab2b3c121822add6cf0ec8ec5612':
Import translations. DO NOT MERGE
2013-12-19 15:34:33 +00:00
Baligh Uddin
5f4deba185
am fb793cb9
: (-s ours) am 8c810a4e
: (-s ours) am 7ba72721
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fb793cb94e762c8c50072c529bba093777d3fa9f':
Import translations. DO NOT MERGE
2013-12-19 15:32:59 +00:00
Baligh Uddin
fb793cb94e
am 8c810a4e
: (-s ours) am 7ba72721
: (-s ours) Import translations. DO NOT MERGE
...
* commit '8c810a4e5dd0435f621e4f3f691bfc567d948ee0':
Import translations. DO NOT MERGE
2013-12-19 07:30:01 -08:00
Baligh Uddin
8c810a4e5d
am 7ba72721
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7ba72721134adeda10972f68fbcf74a491c6b11e':
Import translations. DO NOT MERGE
2013-12-19 07:28:03 -08:00
Baligh Uddin
f2398abe54
Import translations. DO NOT MERGE
...
Change-Id: Ie72bd5a59406450877a580e2c60c0c81f48ef603
Auto-generated-cl: translation import
2013-12-18 22:15:35 -08:00
Baligh Uddin
7ba7272113
Import translations. DO NOT MERGE
...
Change-Id: Ib169fe13c8487481f13d4a17b9f09bd04883f93e
Auto-generated-cl: translation import
2013-12-18 22:12:01 -08:00
Baligh Uddin
1bb8618339
am 665d1db2
: (-s ours) am d48a1386
: (-s ours) am 379bb6ef
: (-s ours) am ee9a2cbc
: (-s ours) am 1177cdec
: (-s ours) Import translations. DO NOT MERGE
...
* commit '665d1db296cf2cc9fb527ebe9a376ac2428ebb13':
Import translations. DO NOT MERGE
2013-12-17 17:41:44 +00:00
Baligh Uddin
665d1db296
am d48a1386
: (-s ours) am 379bb6ef
: (-s ours) am ee9a2cbc
: (-s ours) am 1177cdec
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd48a138605e735175b519cb998e478a7aad0c60f':
Import translations. DO NOT MERGE
2013-12-17 17:40:19 +00:00
Baligh Uddin
d48a138605
am 379bb6ef
: (-s ours) am ee9a2cbc
: (-s ours) am 1177cdec
: (-s ours) Import translations. DO NOT MERGE
...
* commit '379bb6ef5a1140497c7cf3510faea1c705fe4583':
Import translations. DO NOT MERGE
2013-12-17 17:38:44 +00:00
Baligh Uddin
379bb6ef5a
am ee9a2cbc
: (-s ours) am 1177cdec
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ee9a2cbcf3a12f65ddbc05507bf51ad161feee05':
Import translations. DO NOT MERGE
2013-12-17 09:35:44 -08:00
Baligh Uddin
ee9a2cbcf3
am 1177cdec
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1177cdec4eeeacc787059a7843ade6571f54ac5f':
Import translations. DO NOT MERGE
2013-12-17 09:33:32 -08:00
Baligh Uddin
ecee72d15e
Merge "Import translations. DO NOT MERGE"
2013-12-17 17:31:04 +00:00
Alan Viverette
17bf9338f6
Merge "Update A11y service dialog for explicit create() before getButton()"
2013-12-17 01:20:41 +00:00
Baligh Uddin
26bfaefa84
Import translations. DO NOT MERGE
...
Change-Id: Iae6f3674d6838e5027505bde8a176c6d1add43df
Auto-generated-cl: translation import
2013-12-16 12:47:52 -08:00
Baligh Uddin
1177cdec4e
Import translations. DO NOT MERGE
...
Change-Id: I41e0c190e9f01cfccff03435cebbf732b603751f
Auto-generated-cl: translation import
2013-12-16 12:44:01 -08:00
Andres Morales
73fed2c477
Merge "fix npe in SecuritySettings"
2013-12-16 19:27:30 +00:00
Andres Morales
5786e5f471
fix npe in SecuritySettings
...
Change-Id: Ib381cb7b985046fd4446e00ef67e3f2c12313796
2013-12-16 11:23:14 -08:00
Kenny Root
2d8e25af35
am 3bf6ac0c
: am ead1bcd9
: am ef2f97c7
: am e14a5ef6
: Merge "Use java.util.Objects instead of internal API"
...
* commit '3bf6ac0c0ea1fe05f925d8df3db2e35f674dce4a':
Use java.util.Objects instead of internal API
2013-12-13 22:57:33 +00:00
Kenny Root
3bf6ac0c0e
am ead1bcd9
: am ef2f97c7
: am e14a5ef6
: Merge "Use java.util.Objects instead of internal API"
...
* commit 'ead1bcd9a23a811b25a73e663c556c590e649d82':
Use java.util.Objects instead of internal API
2013-12-13 22:04:16 +00:00
Kenny Root
ead1bcd9a2
am ef2f97c7
: am e14a5ef6
: Merge "Use java.util.Objects instead of internal API"
...
* commit 'ef2f97c70e5942f390daf8e227eafa44ea675f09':
Use java.util.Objects instead of internal API
2013-12-13 22:01:13 +00:00
Kenny Root
ef2f97c70e
am e14a5ef6
: Merge "Use java.util.Objects instead of internal API"
...
* commit 'e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
Use java.util.Objects instead of internal API
2013-12-13 13:58:59 -08:00
Kenny Root
e14a5ef660
Merge "Use java.util.Objects instead of internal API"
2013-12-13 21:51:30 +00:00
Kenny Root
7440dde808
Use java.util.Objects instead of internal API
...
Change-Id: Ib0d797b3e7f2e4f831f52832776b64c0973880b3
2013-12-13 13:28:33 -08:00
Andres Morales
ef693b5707
Merge "Settings for NFC Unlock"
2013-12-12 17:38:26 +00:00
Baligh Uddin
5a14ab8930
am 061662cb
: (-s ours) am 02dd4a20
: (-s ours) am f4f14efc
: (-s ours) am 5fcebc78
: (-s ours) am 879cc42f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '061662cb1734b84709d019ac1d92ad418f3c966c':
Import translations. DO NOT MERGE
2013-12-12 16:54:17 +00:00
Baligh Uddin
061662cb17
am 02dd4a20
: (-s ours) am f4f14efc
: (-s ours) am 5fcebc78
: (-s ours) am 879cc42f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '02dd4a20e9a2ad1733e8cd52729f4c5683220f56':
Import translations. DO NOT MERGE
2013-12-12 16:51:25 +00:00
Baligh Uddin
02dd4a20e9
am f4f14efc
: (-s ours) am 5fcebc78
: (-s ours) am 879cc42f
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f4f14efc79b82b7f99d311ae59ec394d60ae81c1':
Import translations. DO NOT MERGE
2013-12-12 16:44:02 +00:00
Baligh Uddin
f4f14efc79
am 5fcebc78
: (-s ours) am 879cc42f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5fcebc78b9f6a05ac661dba25acbd354981e9168':
Import translations. DO NOT MERGE
2013-12-12 08:40:48 -08:00
Baligh Uddin
5fcebc78b9
am 879cc42f
: (-s ours) Import translations. DO NOT MERGE
...
* commit '879cc42fb33f717f985e4627355c7735c78f16b3':
Import translations. DO NOT MERGE
2013-12-12 07:46:25 -08:00
Baligh Uddin
879cc42fb3
Import translations. DO NOT MERGE
...
Change-Id: I653a48c8fe5951d7987fc807befc343913ae11f3
Auto-generated-cl: translation import
2013-12-11 20:01:51 -08:00
Alan Viverette
72cb46f1b7
Update A11y service dialog for explicit create() before getButton()
...
Change-Id: Ic0fb7e2e7985dd3d3b65e40a639ab5fc0f5a8fd5
2013-12-11 16:07:00 -08:00
Vinit Deshapnde
c621418d3d
Move Wifi/P2p service components under services
...
Some methods need to be public, since frameworks/base complies before
frameworks/base/services; and services takes build dependency on base.
Similar issue exists with WifiEnterpriseConfig constants.
Bug: 9907308
Change-Id: Ied0e3dee0b25c939067dbc66867a9814b3b3b68e
2013-12-11 16:05:46 -08:00
Alan Viverette
22b70376ed
Merge "Accessibility: filter touches to Enable button"
2013-12-10 21:58:45 +00:00
Alan Viverette
3829a7b2e5
Merge "Remove dialog offering to download TalkBack"
2013-12-10 21:54:02 +00:00