OSDN Git Service

android-x86/packages-apps-Settings.git
8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 12:21:10 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import

8 years agoam cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translati...
Geoff Mendal [Wed, 14 Oct 2015 12:49:34 +0000 (12:49 +0000)]
am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit 'cec2a65a98161c6c69e373647f03745c59246097':
  Import translations. DO NOT MERGE

8 years agoam 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:45:51 +0000 (12:45 +0000)]
am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE

8 years agoam 46eb1857: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:40:45 +0000 (12:40 +0000)]
am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:30:54 +0000 (05:30 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:17:15 +0000 (05:17 -0700)]
Import translations. DO NOT MERGE

Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import

8 years agoam 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translati...
Geoff Mendal [Mon, 12 Oct 2015 13:04:48 +0000 (13:04 +0000)]
am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE

* commit '0e3ffe7cce1ceeac9eeac839d41db40ba983f97d':
  Import translations. DO NOT MERGE

8 years agoam 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 13:00:56 +0000 (13:00 +0000)]
am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE

* commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
  Import translations. DO NOT MERGE

8 years agoam 4fedc0fd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:55:33 +0000 (12:55 +0000)]
am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE

* commit '4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:34:25 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia5044b8f155b8256dedc8581f8c7147ffdd0d2bc
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:21:40 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0eb630b2b5dec19d48787ff56367a3f05b41483a
Auto-generated-cl: translation import

8 years agoam 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translati...
Geoff Mendal [Wed, 7 Oct 2015 12:56:45 +0000 (12:56 +0000)]
am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE

* commit '3963b980bebacb58dd2ed57fd45b042a01f125a0':
  Import translations. DO NOT MERGE

8 years agoam 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:51:18 +0000 (12:51 +0000)]
am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE

* commit '793b2a2d444192ee587a643c88e535ebf0c98158':
  Import translations. DO NOT MERGE

8 years agoam d4fd061d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:46:38 +0000 (12:46 +0000)]
am d4fd061d: (-s ours) Import translations. DO NOT MERGE

* commit 'd4fd061d6e33abb96dd8a6cac2d14cdbca154ce9':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:36:18 +0000 (05:36 -0700)]
Import translations. DO NOT MERGE

Change-Id: I93b053134a71c4db60e58d3bf8fd9c43cd90cc9b
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:23:13 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ifeb18585f7add2909ad50d12839ba920a76cf44c
Auto-generated-cl: translation import

8 years agoam 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translati...
Geoff Mendal [Mon, 5 Oct 2015 12:52:33 +0000 (12:52 +0000)]
am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE

* commit '45335b0c5eeaeb068af6c35bcaa25b08cf10db9d':
  Import translations. DO NOT MERGE

8 years agoam 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:45:22 +0000 (12:45 +0000)]
am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE

* commit '0070fbfe01eab83402949298188322f1168b5b3c':
  Import translations. DO NOT MERGE

8 years agoam f0338376: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:41:50 +0000 (12:41 +0000)]
am f0338376: (-s ours) Import translations. DO NOT MERGE

* commit 'f0338376779311f2ee0c709e9735dfe5e89cde56':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:33:27 +0000 (05:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2aa93f9635911e98133a6ab0cbba1740c62551cf
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:20:30 +0000 (05:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: I56f2a38c8fee8b9cc019538933dfeead37a14d75
Auto-generated-cl: translation import

8 years agoam c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translati...
Geoff Mendal [Wed, 30 Sep 2015 12:51:15 +0000 (12:51 +0000)]
am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE

* commit 'c7b0a8162520ffedcfcddb86d1f0e394513b7cf1':
  Import translations. DO NOT MERGE

8 years agoam 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:47:04 +0000 (12:47 +0000)]
am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE

* commit '49b491bb7634284a8622e48c88571aa59ba59ac7':
  Import translations. DO NOT MERGE

8 years agoam 2e095fa2: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:41:16 +0000 (12:41 +0000)]
am 2e095fa2: (-s ours) Import translations. DO NOT MERGE

* commit '2e095fa263b0887fc55576b32625264e13fee4c7':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:34:33 +0000 (05:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: I80d2cc4534deffcec5bd3f7566e19a2107ead775
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:21:29 +0000 (05:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I27cf12c7d6f311ec58e53d5b762c980641361541
Auto-generated-cl: translation import

8 years agoam 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translati...
Baligh Uddin [Sun, 27 Sep 2015 03:04:11 +0000 (03:04 +0000)]
am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE

* commit '2b802ceb328658fa18e007f859bda47a755dce30':
  Import translations. DO NOT MERGE

8 years agoam cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:57:14 +0000 (02:57 +0000)]
am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE

* commit 'cd6e60343a70ecf870f1ac3dcfa1e7981de8773d':
  Import translations. DO NOT MERGE

8 years agoam 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:56:45 +0000 (02:56 +0000)]
am 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import translations. DO NOT MERGE

* commit '9b9d77f163b65057540b37ac4f6732f01f2b2e40':
  Import translations. DO NOT MERGE

8 years agoam 15243a26: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:50:43 +0000 (02:50 +0000)]
am 15243a26: (-s ours) Import translations. DO NOT MERGE

* commit '15243a260c8accf0a1fc999282a10d1ecec334b6':
  Import translations. DO NOT MERGE

8 years agoam d0d54fc1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 27 Sep 2015 02:49:56 +0000 (02:49 +0000)]
am d0d54fc1: (-s ours) Import translations. DO NOT MERGE

* commit 'd0d54fc1c54a046eaf919978d584fa3528c36e24':
  Import translations. DO NOT MERGE

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 20:23:31 +0000 (13:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 20:14:23 +0000 (13:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7678603b3f13a9cb9c95006d37c68689d6d9a509
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 25 Sep 2015 20:05:09 +0000 (13:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icdfa968f3734bb4b5cfd7ae32918de6949159f8d
Auto-generated-cl: translation import

8 years agoam 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc1...
Zach Jang [Mon, 21 Sep 2015 21:06:16 +0000 (21:06 +0000)]
am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '1304f47c1b63d1daa001f4d1c209a34f1b3af5d3':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag...
Zach Jang [Mon, 21 Sep 2015 21:06:13 +0000 (21:06 +0000)]
am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '564ec9357bac62d571ba8ba9d58957477b8b5209':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03...
Zach Jang [Mon, 21 Sep 2015 19:05:39 +0000 (19:05 +0000)]
am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '5cac896612ead73d08acb588e2f62512f8789cf4':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Securit...
Zach Jang [Mon, 21 Sep 2015 19:05:36 +0000 (19:05 +0000)]
am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT...
Zach Jang [Mon, 21 Sep 2015 18:58:23 +0000 (18:58 +0000)]
am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '8fc9b5b68494ac341b882623b1cbe124fd6256f8':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level...
Zach Jang [Mon, 21 Sep 2015 18:58:12 +0000 (18:58 +0000)]
am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport...
Zach Jang [Thu, 17 Sep 2015 20:40:30 +0000 (20:40 +0000)]
am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '2e006b2b07c7c333c51fb9b447b8df6df66ba421':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147...
Zach Jang [Thu, 17 Sep 2015 20:27:21 +0000 (20:27 +0000)]
am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level...
Zach Jang [Thu, 17 Sep 2015 20:16:45 +0000 (20:16 +0000)]
am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings...
Zach Jang [Thu, 17 Sep 2015 20:04:24 +0000 (20:04 +0000)]
am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit 'e7e0c03f003930461603ae71ec0ce815d5a7f40a':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoam 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings...
Zach Jang [Thu, 17 Sep 2015 20:04:18 +0000 (20:04 +0000)]
am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3

8 years agoDO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
Zach Jang [Mon, 14 Sep 2015 21:03:12 +0000 (14:03 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c

8 years agoDO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
Zach Jang [Sat, 12 Sep 2015 00:37:48 +0000 (17:37 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0

8 years agoam 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am...
Sanket Padawe [Wed, 5 Aug 2015 18:28:12 +0000 (18:28 +0000)]
am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '86d853000feca5a627ef87760cdd7df3c3aea1bb':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check...
Sanket Padawe [Wed, 29 Jul 2015 20:03:32 +0000 (20:03 +0000)]
am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '19336da3f729fcde00782ae60124b1219bd4bf2b':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special...
Sanket Padawe [Wed, 29 Jul 2015 19:49:53 +0000 (19:49 +0000)]
am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'ac2347c0bf3c2b9c2ff7d8e2abe0a38d861495c4':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renam...
Sanket Padawe [Wed, 29 Jul 2015 19:25:06 +0000 (19:25 +0000)]
am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device...
Sanket Padawe [Wed, 29 Jul 2015 17:08:45 +0000 (17:08 +0000)]
am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 16:44:58 +0000 (16:44 +0000)]
am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam e05f7143: Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 16:15:17 +0000 (16:15 +0000)]
am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoCheck for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Mon, 18 May 2015 18:39:01 +0000 (11:39 -0700)]
Check for special char when renaming device for Wi-Fi direct.

Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef348c17a985eb51ef74469a32c3c938d)

9 years agoam b6073c48: am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries"
Alan Viverette [Fri, 24 Apr 2015 18:41:05 +0000 (18:41 +0000)]
am b6073c48: am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries"

* commit 'b6073c486cb2eb537fd6e53000dce55afe762fc1':
  Settings: Fix wifi developer options summaries

9 years agoam 93ecb1f0: Merge "Settings: Fix wifi developer options summaries"
Alan Viverette [Fri, 24 Apr 2015 18:28:50 +0000 (18:28 +0000)]
am 93ecb1f0: Merge "Settings: Fix wifi developer options summaries"

* commit '93ecb1f0124da17c55ad52fe572eaf4a8c3868d5':
  Settings: Fix wifi developer options summaries

9 years agoMerge "Settings: Fix wifi developer options summaries"
Alan Viverette [Fri, 24 Apr 2015 18:05:09 +0000 (18:05 +0000)]
Merge "Settings: Fix wifi developer options summaries"

9 years agoam 48e7e2ac: am 2e30bff1: Merge "Add Europe/Madrid."
Elliott Hughes [Thu, 16 Apr 2015 15:34:58 +0000 (15:34 +0000)]
am 48e7e2ac: am 2e30bff1: Merge "Add Europe/Madrid."

* commit '48e7e2ac182b94b7c2b682874d0dea969b59339a':
  Add Europe/Madrid.

9 years agoam 2e30bff1: Merge "Add Europe/Madrid."
Elliott Hughes [Thu, 16 Apr 2015 15:24:40 +0000 (15:24 +0000)]
am 2e30bff1: Merge "Add Europe/Madrid."

* commit '2e30bff1351fafd2bbad2c46c55515e74f5d027c':
  Add Europe/Madrid.

9 years agoMerge "Add Europe/Madrid."
Elliott Hughes [Thu, 16 Apr 2015 15:03:03 +0000 (15:03 +0000)]
Merge "Add Europe/Madrid."

9 years agoAdd Europe/Madrid.
Elliott Hughes [Thu, 16 Apr 2015 00:37:16 +0000 (17:37 -0700)]
Add Europe/Madrid.

50 million Spaniards can't be wrong.

Bug: 19519953
Change-Id: I10712165d32d90977453e7053057e6260c005f84

9 years agoam ff095ab0: am 189d7e8e: Merge "Add Europe/Istanbul timezone"
Elliott Hughes [Thu, 2 Apr 2015 17:50:21 +0000 (17:50 +0000)]
am ff095ab0: am 189d7e8e: Merge "Add Europe/Istanbul timezone"

* commit 'ff095ab05bc6660abd38d9de047ac467c2d070fc':
  Add Europe/Istanbul timezone

9 years agoam 189d7e8e: Merge "Add Europe/Istanbul timezone"
Elliott Hughes [Thu, 2 Apr 2015 17:40:44 +0000 (17:40 +0000)]
am 189d7e8e: Merge "Add Europe/Istanbul timezone"

* commit '189d7e8e5151cc8774f4c7eb1b00e8efabdc627f':
  Add Europe/Istanbul timezone

9 years agoMerge "Add Europe/Istanbul timezone"
Elliott Hughes [Thu, 2 Apr 2015 17:19:27 +0000 (17:19 +0000)]
Merge "Add Europe/Istanbul timezone"

9 years agoAdd Europe/Istanbul timezone
Samuel Asteberg [Mon, 22 Sep 2014 10:24:40 +0000 (12:24 +0200)]
Add Europe/Istanbul timezone

Change-Id: I522107e7aead4d7ec587a19202af23df71d16d83

9 years agoam 144c48e7: am 49fe5084: Merge "add Recife timezone"
Elliott Hughes [Thu, 2 Apr 2015 02:33:26 +0000 (02:33 +0000)]
am 144c48e7: am 49fe5084: Merge "add Recife timezone"

* commit '144c48e72736ce9617dfa15331262c13819a17e6':
  add Recife timezone

9 years agoam 49fe5084: Merge "add Recife timezone"
Elliott Hughes [Thu, 2 Apr 2015 01:13:17 +0000 (01:13 +0000)]
am 49fe5084: Merge "add Recife timezone"

* commit '49fe5084f73821906572f60bd542ca5042cb794d':
  add Recife timezone

9 years agoMerge "add Recife timezone"
Elliott Hughes [Wed, 1 Apr 2015 23:55:55 +0000 (23:55 +0000)]
Merge "add Recife timezone"

9 years agoMerge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct...
Jason Sams [Fri, 27 Mar 2015 01:24:58 +0000 (01:24 +0000)]
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Settings into lmp-mr1-ub-dev

9 years agoam 7b6bd4d8: am 6b08e11e: am 53eec9fa: Fix sim notifications.
Stuart Scott [Fri, 27 Mar 2015 01:10:27 +0000 (01:10 +0000)]
am 7b6bd4d8: am 6b08e11e: am 53eec9fa: Fix sim notifications.

* commit '7b6bd4d8c5c59663468ef0e17e8ebf31fd63c06d':

9 years agoam 6b08e11e: am 53eec9fa: Fix sim notifications.
Stuart Scott [Fri, 27 Mar 2015 00:50:43 +0000 (00:50 +0000)]
am 6b08e11e: am 53eec9fa: Fix sim notifications.

* commit '6b08e11ef979cd8eb47d91be262c08fc3813bd7f':

9 years agoam 53eec9fa: Fix sim notifications.
Stuart Scott [Fri, 27 Mar 2015 00:34:46 +0000 (00:34 +0000)]
am 53eec9fa: Fix sim notifications.

* commit '53eec9faad4f96497ab5cccaadb05963c3694363':
  Fix sim notifications.

9 years agoam 4a682e56: am c28e80b8: am 53eec9fa: Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 22:04:59 +0000 (22:04 +0000)]
am 4a682e56: am c28e80b8: am 53eec9fa: Fix sim notifications.

* commit '4a682e56c80435e1f3ce7bc8ae848337a2426fc3':
  Fix sim notifications.

9 years agoam c28e80b8: am 53eec9fa: Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 20:34:04 +0000 (20:34 +0000)]
am c28e80b8: am 53eec9fa: Fix sim notifications.

* commit 'c28e80b8fb1a4fd6d326bbb79547f3597cf0412f':
  Fix sim notifications.

9 years agoam 53eec9fa: Fix sim notifications.
Stuart Scott [Wed, 25 Mar 2015 19:48:23 +0000 (19:48 +0000)]
am 53eec9fa: Fix sim notifications.

* commit '53eec9faad4f96497ab5cccaadb05963c3694363':
  Fix sim notifications.

9 years agoFix sim notifications.
Stuart Scott [Mon, 16 Mar 2015 19:17:56 +0000 (12:17 -0700)]
Fix sim notifications.

bug:19705366
Change-Id: I1d1f2dc5cf1d4580ab503c88853b089db0362242

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 23 Mar 2015 13:02:39 +0000 (13:02 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

9 years agoam 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:55:53 +0000 (12:55 +0000)]
am 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE

* commit '674d1d6be522defb7934c9e66e439ed99e827bc4':
  Import translations. DO NOT MERGE

9 years agoam 47d342c3: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:49:40 +0000 (12:49 +0000)]
am 47d342c3: (-s ours) Import translations. DO NOT MERGE

* commit '47d342c371683ca1c02ad709f4eed27541cb8e5f':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:46:37 +0000 (07:46 -0500)]
Import translations. DO NOT MERGE

Change-Id: I40cd8ee6c6901d97827a93e1f6fa33a8a4cfe4db
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:35:10 +0000 (07:35 -0500)]
Import translations. DO NOT MERGE

Change-Id: I136df854ba22b1b72b4c0a4a644202838285e8c4
Auto-generated-cl: translation import

9 years agoam 4b52bfbb: (-s ours) am d20acfeb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 17:08:16 +0000 (17:08 +0000)]
am 4b52bfbb: (-s ours) am d20acfeb: (-s ours) Import translations. DO NOT MERGE

* commit '4b52bfbbfa39092ca4299f7f29eaa08be359ac91':
  Import translations. DO NOT MERGE

9 years agoam d20acfeb: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 16:20:55 +0000 (16:20 +0000)]
am d20acfeb: (-s ours) Import translations. DO NOT MERGE

* commit 'd20acfeb3fbeb9ea54bf049a0e8fe66ef0f64f22':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 06:22:04 +0000 (01:22 -0500)]
Import translations. DO NOT MERGE

Change-Id: I9a02bfcde8e9387db93ed7b3322d1af68ee59695
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 06:10:51 +0000 (01:10 -0500)]
Import translations. DO NOT MERGE

Change-Id: Idf67f4e0412fa4bc70819dda56004d6f40155e90
Auto-generated-cl: translation import

9 years agoSettings: Fix wifi developer options summaries
Michael Bestas [Sun, 23 Nov 2014 23:52:38 +0000 (01:52 +0200)]
Settings: Fix wifi developer options summaries

Change-Id: I85688d59685d3a0b0a48e51581eee77ebc7cd2fa

9 years agoam b9b1124c: (-s ours) am ac8641ed: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 18:24:08 +0000 (18:24 +0000)]
am b9b1124c: (-s ours) am ac8641ed: (-s ours) Import translations. DO NOT MERGE

* commit 'b9b1124cd7cd1109068d8bba1cf3a35c1626f32f':
  Import translations. DO NOT MERGE

9 years agoam ac8641ed: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 16:54:53 +0000 (16:54 +0000)]
am ac8641ed: (-s ours) Import translations. DO NOT MERGE

* commit 'ac8641ede6c0c4d4062789ed019954c7e1f77d9b':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:56:44 +0000 (05:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia82339bdeddcb2be2864732de532c5d669d9a286
Auto-generated-cl: translation import

9 years agoam a03c39aa: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:50:58 +0000 (12:50 +0000)]
am a03c39aa: (-s ours) Import translations. DO NOT MERGE

* commit 'a03c39aae8309416364d6d0ccbb0ec89c009b05d':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Mar 2015 12:45:01 +0000 (05:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: I13ef4dce2edd63600d99c7234274f5b2daafd943
Auto-generated-cl: translation import

9 years agoam d28b6bae: (-s ours) am 01492de4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:10:47 +0000 (13:10 +0000)]
am d28b6bae: (-s ours) am 01492de4: (-s ours) Import translations. DO NOT MERGE

* commit 'd28b6bae2491145241eb4e3a3384ed059f615234':
  Import translations. DO NOT MERGE

9 years agoam 01492de4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:03:30 +0000 (13:03 +0000)]
am 01492de4: (-s ours) Import translations. DO NOT MERGE

* commit '01492de48d374833e8b4d304308e5fd394eeafcc':
  Import translations. DO NOT MERGE

9 years agoam d1e37422: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:49:26 +0000 (12:49 +0000)]
am d1e37422: (-s ours) Import translations. DO NOT MERGE

* commit 'd1e37422b255a9417dfa5c6cb30e03e177fed5ad':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:44:27 +0000 (05:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I785caae50a0df960b25d862e06b2fa8010c1bd26
Auto-generated-cl: translation import

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:32:21 +0000 (05:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie8486278c1326c35e32e3c87323de45e7225c83e
Auto-generated-cl: translation import

9 years agoam feb731a2: (-s ours) am dd07a862: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 17:25:25 +0000 (17:25 +0000)]
am feb731a2: (-s ours) am dd07a862: (-s ours) Import translations. DO NOT MERGE

* commit 'feb731a2c94d2238587d1a84d0a2d09f99329612':
  Import translations. DO NOT MERGE

9 years agoam f02db6b7: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 17:25:11 +0000 (17:25 +0000)]
am f02db6b7: (-s ours) Import translations. DO NOT MERGE

* commit 'f02db6b7e8fc774e64b812613cde7746d31aa10e':
  Import translations. DO NOT MERGE

9 years agoam dd07a862: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 11 Mar 2015 12:49:26 +0000 (12:49 +0000)]
am dd07a862: (-s ours) Import translations. DO NOT MERGE

* commit 'dd07a86251dd79190bdc7bc811ae09c65eab89d2':
  Import translations. DO NOT MERGE