OSDN Git Service
Baligh Uddin [Thu, 10 Apr 2014 16:06:37 +0000 (16:06 +0000)]
am
b6b3172c: (-s ours) am
915ef6e3: (-s ours) am
52e3681f: (-s ours) Import translations. DO NOT MERGE
* commit '
b6b3172c35646a6292ae312fb23795afafb4c96b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:03:05 +0000 (16:03 +0000)]
am
2632b25f: (-s ours) am
fba8cd35: (-s ours) Import translations. DO NOT MERGE
* commit '
2632b25fae55411ff4974d510d599af75d35045a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:02:35 +0000 (16:02 +0000)]
am
915ef6e3: (-s ours) am
52e3681f: (-s ours) Import translations. DO NOT MERGE
* commit '
915ef6e3127b34c73d43e86149b9aabc23216e72':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:00:02 +0000 (16:00 +0000)]
am
52e3681f: (-s ours) Import translations. DO NOT MERGE
* commit '
52e3681feb64afaefd5cffa5a9e88a97bca4d48d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:59:28 +0000 (15:59 +0000)]
am
8bec9dba: (-s ours) Import translations. DO NOT MERGE
* commit '
8bec9dba479ba901c913f59c7585369af1bf639d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:57:44 +0000 (15:57 +0000)]
am
fba8cd35: (-s ours) Import translations. DO NOT MERGE
* commit '
fba8cd35b71853118508eab15a3cbef96a539dec':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 9 Apr 2014 19:46:43 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iff7d2cccff323a2cfb7193d399e8910f226304d7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Apr 2014 19:43:07 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8cec72991260fa660991ca7423299bbf417df000
Auto-generated-cl: translation import
Baligh Uddin [Wed, 9 Apr 2014 19:41:44 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: I84d923dacf746299500503257fd925228b869e82
Auto-generated-cl: translation import
Baligh Uddin [Tue, 8 Apr 2014 02:39:05 +0000 (02:39 +0000)]
am
ffa6f523: (-s ours) am
f56d838a: (-s ours) am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
ffa6f52358f0f732d83decbfa6be558207969654':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:31:59 +0000 (02:31 +0000)]
am
f56d838a: (-s ours) am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
f56d838afe7f813fb2ed761d3ebeb79b79d910a0':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:31:50 +0000 (02:31 +0000)]
am
b282957b: (-s ours) am
0f2228a5: (-s ours) Import translations. DO NOT MERGE
* commit '
b282957b48df3ede7a0628e2ef6a2ad5dbe73179':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:46 +0000 (02:24 +0000)]
am
0f2228a5: (-s ours) Import translations. DO NOT MERGE
* commit '
0f2228a5480759551b1faf93d510fc9c1c16ea06':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:35 +0000 (02:24 +0000)]
am
2319553c: (-s ours) Import translations. DO NOT MERGE
* commit '
2319553cdc644c4fae21ca3ad55564729f409cf4':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:35 +0000 (02:24 +0000)]
am
b9abc323: (-s ours) Import translations. DO NOT MERGE
* commit '
b9abc323b95650e30589c957062fec790436ec0d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Apr 2014 19:10:30 +0000 (12:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c4dadd6e7a78db976f67c0c494b06495a69e45b
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:07:10 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4c9953f71809e215404a0e150abbba7bb098504a
Auto-generated-cl: translation import
Baligh Uddin [Mon, 7 Apr 2014 19:05:35 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I933f503cae1b0ae72af3c9f3513ff86355d8e095
Auto-generated-cl: translation import
Xia Wang [Sat, 5 Apr 2014 00:51:44 +0000 (00:51 +0000)]
am
d2f56f07: am
ac768973: am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
d2f56f07f97e72e62c51b82454d06de1e7b929a8':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:48:38 +0000 (00:48 +0000)]
am
ac768973: am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
ac768973bc23b9f8f266013c20d301554729fd70':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:43:17 +0000 (00:43 +0000)]
am
ce11881a: Allow VPN to stay connected for some time before disconnecting it.
* commit '
ce11881accf5db04e2a54b58176e24de49ef6917':
Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Fri, 4 Apr 2014 23:23:38 +0000 (16:23 -0700)]
Allow VPN to stay connected for some time before disconnecting it.
Change-Id: I25994b8329514a32b5b6f383abef231d3decb4ec
Baligh Uddin [Fri, 4 Apr 2014 14:53:11 +0000 (14:53 +0000)]
am
87132265: (-s ours) am
3f3469ae: (-s ours) am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
871322653c4109a9640b56374a246120c65f8241':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:45:54 +0000 (14:45 +0000)]
am
44e3e56f: (-s ours) am
216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
44e3e56fe20c2fc59d90b6ef6564458cffb1efa7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:45:45 +0000 (14:45 +0000)]
am
3f3469ae: (-s ours) am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
3f3469aecc1da8bf72482ddae53e11d0245fddd9':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:38:19 +0000 (14:38 +0000)]
am
216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
* commit '
216b5c501bb81977407b5977e6ee709b34f3a37d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:50 +0000 (14:37 +0000)]
am
cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
cc01536f7755da6560a23057ac3dbdec10e3993f':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:37:19 +0000 (14:37 +0000)]
am
457681d5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
457681d5f15aaa32edf76e0765d1e9e2b532893e':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 4 Apr 2014 14:32:06 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Apr 2014 14:32:04 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 4 Apr 2014 14:31:59 +0000 (14:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Adrian Roos [Thu, 3 Apr 2014 14:57:22 +0000 (14:57 +0000)]
am
79a17924: am
0b55caf0: am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
79a179244612b09368209e2c95e48fe836aeab59':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:51:39 +0000 (14:51 +0000)]
am
0b55caf0: am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
0b55caf01af1efa15ff0bfbf50a1726fce788660':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:45:34 +0000 (14:45 +0000)]
am
a52a37b0: am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
a52a37b0fe17109877abbc25943d0d74232f3e5f':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:38:30 +0000 (14:38 +0000)]
am
1b0b38cf: am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
1b0b38cfeb54638899ddab48ff9198590f951a55':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:35:13 +0000 (14:35 +0000)]
am
5d3c8c89: am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:29:57 +0000 (14:29 +0000)]
am
90630f6a: am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
90630f6a6d19e169befb8ad8117d53200eb562c4':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:23:57 +0000 (14:23 +0000)]
am
09235d10: am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
09235d1065b501aa8a42e0767d72c15e7b846bae':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:17:11 +0000 (14:17 +0000)]
am
82b3e62a: am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
82b3e62a4f8c8a229f700bbf122b8f8854162146':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:11:02 +0000 (14:11 +0000)]
am
4692a48c: am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
4692a48c28d7002221fec28d5ac324636f81c8f2':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 14:05:07 +0000 (14:05 +0000)]
am
c4bfea20: am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
c4bfea207acf62c9e70949d3225d082d95d4d193':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am
3f38173f: am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3f38173fadc1423d4c36b265a2ab5fdc09d88271':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:55:28 +0000 (13:55 +0000)]
am
3a7690b1: am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
3a7690b157c100f3a36b6fdc2578a12845875e06':
Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:49:53 +0000 (13:49 +0000)]
am
8184ea52: Add lockout after trying to enter PIN / Password too often
* commit '
8184ea524519a67b1284266844e6e186f3a74cab':
Add lockout after trying to enter PIN / Password too often
Baligh Uddin [Wed, 2 Apr 2014 18:52:34 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id18f3fec7657dd9eba74e4fd0f5c34eeea264fd2
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 18:49:10 +0000 (11:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2521114c59686637b57ea802bbb72aa7fa01615c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 2 Apr 2014 18:47:25 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife01297eb460bb5881d86ed7c0f672ecb461cb48
Auto-generated-cl: translation import
Adrian Roos [Mon, 31 Mar 2014 19:33:35 +0000 (21:33 +0200)]
Add lockout after trying to enter PIN / Password too often
Enforce the same lockout that is already enforced when entering the pattern.
Bug:
13647935
Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
Xia Wang [Wed, 2 Apr 2014 03:51:38 +0000 (03:51 +0000)]
am
8361a97c: am
3e238230: am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
8361a97c43a49b5e7528afd5baeca624d909bbf9':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:45:56 +0000 (03:45 +0000)]
am
3e238230: am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
3e23823015d2ad0679d89adc2a62c7d568adada8':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:40:26 +0000 (03:40 +0000)]
am
836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
* commit '
836eff87a93f5b2857b41763197ab6782581aafc':
Add legacy VPN test framework and test cases
Xia Wang [Wed, 2 Apr 2014 03:36:50 +0000 (03:36 +0000)]
Merge "Add legacy VPN test framework and test cases" into klp-dev
Xia Wang [Sat, 29 Mar 2014 00:20:53 +0000 (17:20 -0700)]
Add legacy VPN test framework and test cases
- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases
Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c
Baligh Uddin [Tue, 1 Apr 2014 00:21:31 +0000 (00:21 +0000)]
am
cf743762: (-s ours) am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
cf743762611ceb918aabee179ef10f81ccc90aaf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:15:49 +0000 (00:15 +0000)]
am
88adaa72: (-s ours) am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
88adaa72a385c3199787ecd3dae826f25d38572d':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:09:19 +0000 (00:09 +0000)]
am
112916b5: (-s ours) Import translations. DO NOT MERGE
* commit '
112916b59634a86195880a1368d8d60a86f33188':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:08:46 +0000 (00:08 +0000)]
am
518a5037: (-s ours) Import translations. DO NOT MERGE
* commit '
518a503740bcb900fe8a69c86f5826466f99ee6e':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 21:42:20 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2df2a0668882bab5b18242e3db72b5a5daf983b0
Auto-generated-cl: translation import
Baligh Uddin [Mon, 31 Mar 2014 21:40:25 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import
John Spurlock [Fri, 28 Mar 2014 19:01:12 +0000 (19:01 +0000)]
am
c4231382: DO NOT MERGE Settings: Implement new required method.
* commit '
c423138247857312a4ac6ad32cb482868315bd61':
DO NOT MERGE Settings: Implement new required method.
John Spurlock [Fri, 28 Mar 2014 13:41:30 +0000 (09:41 -0400)]
DO NOT MERGE Settings: Implement new required method.
Only required since it uses the non-public version
of the api.
Bug:
13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa
Baligh Uddin [Thu, 27 Mar 2014 23:10:42 +0000 (23:10 +0000)]
am
584ac4c5: (-s ours) am
f39672bf: (-s ours) am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
584ac4c525d45dfdc61f3f9db746582622e2ab5b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 23:05:03 +0000 (23:05 +0000)]
am
f39672bf: (-s ours) am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
f39672bfac77a604a3a04484f7d88adc4ecf9c66':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 22:22:05 +0000 (22:22 +0000)]
am
1dc01d10: (-s ours) Import translations. DO NOT MERGE
* commit '
1dc01d10ddb19355dc21b6e677afcf33aa460136':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 22:22:03 +0000 (22:22 +0000)]
am
3a9b49f9: (-s ours) Import translations. DO NOT MERGE
* commit '
3a9b49f975df7c53e86dd795e21f904442c22a4a':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Mar 2014 21:11:08 +0000 (14:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09b061fd0c7dd8e4ea00e6627af4e8dfa0d01200
Auto-generated-cl: translation import
Baligh Uddin [Wed, 26 Mar 2014 21:08:55 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I81d83e8408295dcc6e24b92459170e9d81d2ec0f
Auto-generated-cl: translation import
Baligh Uddin [Tue, 25 Mar 2014 19:06:01 +0000 (19:06 +0000)]
am
5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
5f4696f8e00731d2825ec6fc7d24c020f3e75f73':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 19:01:04 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 25 Mar 2014 17:07:48 +0000 (17:07 +0000)]
am
7bad0786: (-s ours) am
b86dff84: (-s ours) am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
7bad0786ec63fc513a195579417901722c8689db':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 17:02:02 +0000 (17:02 +0000)]
am
b86dff84: (-s ours) am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
b86dff8480e486847148f9651bc830b762d307ee':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 16:54:48 +0000 (16:54 +0000)]
am
da4a6a53: (-s ours) Import translations. DO NOT MERGE
* commit '
da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 20:01:09 +0000 (13:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I75bc6fa1afafd7abc9a8d0af3e8825c053225807
Auto-generated-cl: translation import
Baligh Uddin [Mon, 24 Mar 2014 19:59:14 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import
Baligh Uddin [Thu, 20 Mar 2014 19:09:05 +0000 (19:09 +0000)]
am
e3a0b402: (-s ours) am
2e71c1df: (-s ours) am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
e3a0b402c3d9163b5dff884c44d3a5f2a86e80aa':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 19:02:30 +0000 (19:02 +0000)]
am
2e71c1df: (-s ours) am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:41:54 +0000 (18:41 +0000)]
am
947e8995: (-s ours) Import translations. DO NOT MERGE
* commit '
947e8995856a66d05bfb614edf00dd5edfecc4ba':
Import translations. DO NOT MERGE
Wei Wang [Thu, 20 Mar 2014 16:24:12 +0000 (16:24 +0000)]
am
41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
* commit '
41f5437def4b97581d67b5636ca2dba10f8eb385':
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
Wei Wang [Fri, 28 Feb 2014 00:28:34 +0000 (16:28 -0800)]
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
This is cherry pick from master/klp-dev changes.
This reverts commit
eb56b9ccb8fa70a6c567d0bcd02f821e4de4bf7b.
Conflicts:
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
src/com/android/settings/bluetooth/BluetoothSettings.java
src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87
Conflicts:
src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
src/com/android/settings/bluetooth/BluetoothSettings.java
src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
Baligh Uddin [Wed, 19 Mar 2014 20:10:41 +0000 (13:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import
Geoff Mendal [Mon, 17 Mar 2014 20:52:13 +0000 (20:52 +0000)]
am
27259b53: (-s ours) am
c8131cb9: (-s ours) am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
27259b53e6db8781ef7aea614298d50bf26d30e4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:46:32 +0000 (20:46 +0000)]
am
c8131cb9: (-s ours) am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
c8131cb90e92b08cbfdc99690a5b5fa6a5e9cc48':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:34:20 +0000 (20:34 +0000)]
am
e8de72e5: (-s ours) Import translations. DO NOT MERGE
* commit '
e8de72e53ae22a9e373b8c65c8f57c14bf4a81eb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 19:42:54 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import
David Braun [Fri, 14 Mar 2014 16:32:41 +0000 (16:32 +0000)]
am
c0737638: am
63ac6a06: am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
c07376380f566e241dd4ba85a23ff791bdea1524':
Add string parameter order to default SMS dialog text
Baligh Uddin [Fri, 14 Mar 2014 16:32:40 +0000 (16:32 +0000)]
am
1badeea1: (-s ours) am
25503480: (-s ours) am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
1badeea19584849f4e324d658a0ce160e6707388':
Import translations. DO NOT MERGE
David Braun [Fri, 14 Mar 2014 16:28:00 +0000 (16:28 +0000)]
am
63ac6a06: am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
63ac6a06efd39078b3fc066896fc7ea003ab34ce':
Add string parameter order to default SMS dialog text
Baligh Uddin [Fri, 14 Mar 2014 16:27:48 +0000 (16:27 +0000)]
am
25503480: (-s ours) am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
255034803c3301cbf93ce64a2740af2abe8dc1f9':
Import translations. DO NOT MERGE
David Braun [Thu, 13 Mar 2014 18:30:11 +0000 (18:30 +0000)]
am
edcb923d: Add string parameter order to default SMS dialog text
* commit '
edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
Add string parameter order to default SMS dialog text
David Braun [Thu, 13 Mar 2014 18:20:48 +0000 (11:20 -0700)]
Add string parameter order to default SMS dialog text
Bug:
13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8
Baligh Uddin [Thu, 13 Mar 2014 18:02:47 +0000 (18:02 +0000)]
am
a60df014: (-s ours) am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
a60df014e27d9cd57396655b98922394ff7d73bb':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:02:19 +0000 (18:02 +0000)]
am
42972075: am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
429720754d85e1b13bc9001adaa23a0b0db04b61':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Thu, 13 Mar 2014 18:02:18 +0000 (18:02 +0000)]
am
c736f794: am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
c736f794ac38b832b5ffde28502580a9b20b722b':
DO NOT MERGE Remove extra fragment in captioning preferences
Baligh Uddin [Thu, 13 Mar 2014 17:19:21 +0000 (17:19 +0000)]
am
846f036e: (-s ours) am
14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
846f036ef15a2bea6c522e5b75b351b28c29953c':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:40:31 +0000 (16:40 +0000)]
am
7c35c10e: (-s ours) Import translations. DO NOT MERGE
* commit '
7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
Import translations. DO NOT MERGE
Przemyslaw Szczepaniak [Thu, 13 Mar 2014 15:32:48 +0000 (15:32 +0000)]
am
6829c48c: Merge "Fix F/C in TTS settings"
* commit '
6829c48c36fceebb46989f8ee25c369fa5f7adeb':
Fix F/C in TTS settings
Przemyslaw Szczepaniak [Thu, 13 Mar 2014 15:26:47 +0000 (15:26 +0000)]
Merge "Fix F/C in TTS settings"
Alan Viverette [Thu, 13 Mar 2014 10:01:45 +0000 (10:01 +0000)]
am
0100a310: am
8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
* commit '
0100a310d8184baf9576925d160f8af09aa93b10':
DO NOT MERGE Add preference for caption text opacity
Alan Viverette [Thu, 13 Mar 2014 10:01:42 +0000 (10:01 +0000)]
am
a74da813: am
d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
* commit '
a74da813ec622822c8bb8b4524439c81e8b90dfa':
DO NOT MERGE Remove extra fragment in captioning preferences
Shuhrat Dehkanov [Wed, 12 Mar 2014 13:57:08 +0000 (22:57 +0900)]
Fix F/C in TTS settings
This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.
Please see https://code.google.com/p/android/issues/detail?id=63122
Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>