OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 19:48:32 +0000 (19:48 +0000)]
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea  -s ours am: 889036189b  -s ours am: 9acf640efd  -s ours
am: 29c1777ca5  -s ours

Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 19:44:31 +0000 (19:44 +0000)]
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea  -s ours am: 889036189b  -s ours
am: 9acf640efd  -s ours

Change-Id: I3ad55685aaddb775a1991d5251fc01aa69c3a7f0

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155e...
Suprabh Shukla [Wed, 16 Aug 2017 19:40:32 +0000 (19:40 +0000)]
Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea  -s ours
am: 889036189b  -s ours

Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994

6 years agoDisabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
Suprabh Shukla [Wed, 16 Aug 2017 19:38:35 +0000 (19:38 +0000)]
Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
am: 93a9e9f7f2  -s ours

Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63

6 years agoDisabling the activate button when paused am: de5df8b090 am: 779237e37f
Suprabh Shukla [Wed, 16 Aug 2017 19:37:01 +0000 (19:37 +0000)]
Disabling the activate button when paused am: de5df8b090 am: 779237e37f
am: 24547155ea  -s ours

Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2

6 years agoDisabling the activate button when paused am: 9ffee0d534
Suprabh Shukla [Wed, 16 Aug 2017 19:33:30 +0000 (19:33 +0000)]
Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7

Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05

6 years agoDisabling the activate button when paused am: de5df8b090
Suprabh Shukla [Wed, 16 Aug 2017 19:32:31 +0000 (19:32 +0000)]
Disabling the activate button when paused am: de5df8b090
am: 779237e37f

Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]
Disabling the activate button when paused
am: 9ffee0d534

Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429

6 years agoDisabling the activate button when paused
Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]
Disabling the activate button when paused
am: de5df8b090

Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055

6 years agoDisabling the activate button when paused
Suprabh Shukla [Tue, 15 Aug 2017 02:22:17 +0000 (02:22 +0000)]
Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

6 years agoDisabling the activate button when paused
Suprabh Shukla [Tue, 15 Aug 2017 02:11:26 +0000 (02:11 +0000)]
Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

6 years agoDisabling the activate button when paused
Suprabh Shukla [Tue, 15 Aug 2017 02:34:05 +0000 (02:34 +0000)]
Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

7 years agoMerge "Back-port ag/2491664" into mnc-dev
Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]
Merge "Back-port ag/2491664" into mnc-dev

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b
Phil Weaver [Tue, 18 Jul 2017 20:28:31 +0000 (20:28 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b
am: c84dc8feb3

Change-Id: Ia81f4d5e0e9d433e33e19a70a9f63a6cc2afb79a

7 years agoBack-port ag/2491664 am: 1d21738bd6
Phil Weaver [Tue, 18 Jul 2017 20:25:56 +0000 (20:25 +0000)]
Back-port ag/2491664 am: 1d21738bd6
am: 4150739791  -s ours

Change-Id: I580b7232fcbe2c2025d2fd35e7f04ddf1255fd6b

7 years agoMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
Phil Weaver [Tue, 18 Jul 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c
am: cbbdc18c7b

Change-Id: I3cb41508ce487f1d4a21517c86ef57f9cc041705

7 years agoMerge "Back-port ag/2491664" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:26:18 +0000 (18:26 +0000)]
Merge "Back-port ag/2491664" into lmp-dev
am: 41492a1e2c

Change-Id: I4e099fb9a737936f12357670635232a7913e3cfd

7 years agoBack-port ag/2491664
Phil Weaver [Tue, 18 Jul 2017 18:26:16 +0000 (18:26 +0000)]
Back-port ag/2491664
am: 1d21738bd6

Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612

7 years agoMerge "Back-port ag/2491664" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:19:39 +0000 (18:19 +0000)]
Merge "Back-port ag/2491664" into lmp-dev

7 years agoBack-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992

7 years agoBack-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:19:08 +0000 (22:19 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4
am: b72ffa47a4  -s ours

Change-Id: Idc84d1fbeb9e6bcb219c231af4565b666d2d1f00

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:13:16 +0000 (22:13 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours
am: df045253a4

Change-Id: I1ec6fc85e78e081fba4858c8cb4bd7aa2751811c

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c ...
Phil Weaver [Wed, 12 Jul 2017 22:06:35 +0000 (22:06 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours
am: 98e0930394  -s ours

Change-Id: I8de29bde0bf73adde876e6cba0e4e61de6e4f2cb

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
Phil Weaver [Wed, 12 Jul 2017 21:59:38 +0000 (21:59 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e
am: bebc9f9f3c  -s ours

Change-Id: I1d6d10dace8425eb21bacd9582404e876da2db7c

7 years agoDO NOT MERGE Back-port ag/2491664 am: 9a14484b38
Phil Weaver [Wed, 12 Jul 2017 21:55:38 +0000 (21:55 +0000)]
DO NOT MERGE Back-port ag/2491664 am: 9a14484b38
am: 840b78e19e

Change-Id: I5b2add698df347db16bfedb196793ea77b70f8a8

7 years agoDO NOT MERGE Back-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:43:49 +0000 (21:43 +0000)]
DO NOT MERGE Back-port ag/2491664
am: 9a14484b38

Change-Id: Ie1a9075d996f38ac8bbe56e19880bbfd6b9f9a96

7 years agoBack-port ag/2491664
Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]
Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992

7 years agoDO NOT MERGE Back-port ag/2491664
Phil Weaver [Tue, 11 Jul 2017 18:34:40 +0000 (11:34 -0700)]
DO NOT MERGE Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Icbd00799e4b12cde9d17d3d0abbd38d9643b26c4

7 years agoDon't enable a11y service if scary dialog obscured
Phil Weaver [Tue, 9 May 2017 17:51:32 +0000 (10:51 -0700)]
Don't enable a11y service if scary dialog obscured

Bug: 38134845
Test: Trivial back-port of ag/2066325; relying on treehugger
Change-Id: I784eebebe45847431e67aa9032f2f1367156a440

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:44:05 +0000 (19:44 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours am: 13b12fd61d  -s ours
am: 2d9593f8f1  -s ours

Change-Id: Id5ccadb538d8986e86b614d9303a637d6661c482

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:37:33 +0000 (19:37 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours am: 22db6274bf  -s ours
am: 13b12fd61d  -s ours

Change-Id: I20df71c6318262d701b6cb75aff56e9e99c6eaf5

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:32:36 +0000 (19:32 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a am: 0c07b38054  -s ours
am: 22db6274bf  -s ours

Change-Id: Ieeeb4f1677f835787098dd75c4131be5960d6855

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e am...
Dmitry Dementyev [Wed, 12 Apr 2017 19:26:32 +0000 (19:26 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e am: bac5163a9a
am: 0c07b38054  -s ours

Change-Id: Ibb0be31c8bf222d0c823142e075db819a3a52047

7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e
Dmitry Dementyev [Wed, 12 Apr 2017 19:21:36 +0000 (19:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a

Change-Id: Ib70241c596aca047a096318eb2026634692f8620

7 years agoAdd permission check to Intents used by Authenticator Settings.
Dmitry Dementyev [Wed, 12 Apr 2017 19:16:01 +0000 (19:16 +0000)]
Add permission check to Intents used by Authenticator Settings.
am: ea55e6331e

Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232

7 years agoAdd permission check to Intents used by Authenticator Settings.
Dmitry Dementyev [Wed, 15 Mar 2017 19:33:05 +0000 (12:33 -0700)]
Add permission check to Intents used by Authenticator Settings.

Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.

Bug: 33123882
Test: manual tests
Change-Id: I3ba9c768fc4f8093dcf2eadc17f14c506ec5c327
Merged-In: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
Dmitry Dementyev [Wed, 8 Mar 2017 19:11:13 +0000 (19:11 +0000)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c
am: 5c4276a258

Change-Id: Iba7445a15febacfd49ee8a415d8b5a02691b084b

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev
Dmitry Dementyev [Wed, 8 Mar 2017 19:08:40 +0000 (19:08 +0000)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev
am: e24780ed4c

Change-Id: I2fe71909a4b3873fc4e14f7c28b50b0418f85dd1

7 years agoresolve merge conflicts of 75ae46d035 to lmp-mr1-dev
Dmitry Dementyev [Wed, 8 Mar 2017 03:47:52 +0000 (19:47 -0800)]
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev

Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:

7 years agoAdd permission check to Intents used by Authenticator Settings.
Dmitry Dementyev [Tue, 14 Feb 2017 21:15:36 +0000 (13:15 -0800)]
Add permission check to Intents used by Authenticator Settings.

Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.

Bug: 33123882
Test: manual tests
Change-Id: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6

7 years ago[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE
Maurice Lam [Fri, 2 Sep 2016 23:34:38 +0000 (16:34 -0700)]
[Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE

Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39

8 years agoPre-setup restrictions DO NOT MERGE
Jason Monk [Thu, 30 Jun 2016 15:26:08 +0000 (11:26 -0400)]
Pre-setup restrictions DO NOT MERGE

 - Prevent external tiles from system apps
 - Don't let user settings run
 - Disable help

Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 13 Jan 2016 00:44:04 +0000 (16:44 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25447946
Change-Id: Ib40df44dd0aa81ccaec4c45aa65527c71b0b9a81

8 years agoMerge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5e...
Russell Brenner [Tue, 17 Nov 2015 20:05:54 +0000 (20:05 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed am: afe5eada5b
am: 8e4f6fbc2e

* commit '8e4f6fbc2ee74a3f7ede9d63f5a2d9c0ce153f70':
  Block developer settings during SUW

8 years ago[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1
Russell Brenner [Tue, 17 Nov 2015 20:05:43 +0000 (20:05 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79 am: 97759fa8d1
am: 6967df6421  -s ours

* commit '6967df642114a9c84d993cfd544d5a32f04c26b1':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW

8 years agoMerge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
Russell Brenner [Tue, 17 Nov 2015 19:57:00 +0000 (19:57 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev am: 56d630a3ed
am: afe5eada5b

* commit 'afe5eada5bbc6d961c81e881be1f12b1bfcc83e4':
  Block developer settings during SUW

8 years ago[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
Russell Brenner [Tue, 17 Nov 2015 19:56:48 +0000 (19:56 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW am: 14bf226c79
am: 97759fa8d1

* commit '97759fa8d1710c0ac87cd24c69a3d1f161ac3ec3':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW

8 years agoMerge "Block developer settings during SUW" into lmp-mr1-dev
Russell Brenner [Tue, 17 Nov 2015 19:53:17 +0000 (19:53 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev
am: 56d630a3ed

* commit '56d630a3eda390d8514c1e1d9f36c95e7808d1dd':
  Block developer settings during SUW

8 years ago[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Tue, 17 Nov 2015 19:51:09 +0000 (19:51 +0000)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW
am: 14bf226c79

* commit '14bf226c79ee16fc5dd502d81e12bf18b932f39e':
  [DO NOT MERGE] Preserve FRP lock if wiped during SUW

8 years agoMerge "Preserve FRP lock if wiped during SUW" into mnc-dev
Russell Brenner [Tue, 17 Nov 2015 01:14:11 +0000 (01:14 +0000)]
Merge "Preserve FRP lock if wiped during SUW" into mnc-dev

8 years agoMerge "Block developer settings during SUW" into lmp-mr1-dev
Russell Brenner [Tue, 17 Nov 2015 01:13:55 +0000 (01:13 +0000)]
Merge "Block developer settings during SUW" into lmp-mr1-dev

8 years ago[DO NOT MERGE] Preserve FRP lock if wiped during SUW
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
[DO NOT MERGE] Preserve FRP lock if wiped during SUW

Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24

8 years agoPreserve FRP lock if wiped during SUW
Russell Brenner [Fri, 6 Nov 2015 00:03:20 +0000 (16:03 -0800)]
Preserve FRP lock if wiped during SUW

Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

[resolves merge conflicts with ag/808069]

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24

8 years agoUncheck checkbox for contact sharing by default for non carkit devices.
Sanket Padawe [Thu, 12 Nov 2015 22:55:51 +0000 (14:55 -0800)]
Uncheck checkbox for contact sharing by default for non carkit devices.

+ In BT pairing dialog, uncheck checkbox for contact sharing by default
for devices not recognized as carkits at pair time.

Bug: 23607427
Change-Id: I7f1d40d86e713e248d3c225459be4895c4f75d76
(cherry picked from commit dbc47fb262a4273417d99dabab757854aa3b0eaf)

8 years agoBlock developer settings during SUW
Russell Brenner [Mon, 9 Nov 2015 19:35:42 +0000 (11:35 -0800)]
Block developer settings during SUW

Block access to development settings by tapping on the build number
in "About phone". Once SUW has completed, taps will be allowed.

Bug: 25290269
Change-Id: I9b2787712237f28fba446abab15a9e1c075d0419

8 years agoam f191953c: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 13:01:28 +0000 (13:01 +0000)]
am f191953c: (-s ours) Import translations. DO NOT MERGE

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

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 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857...
Geoff Mendal [Wed, 14 Oct 2015 12:53:54 +0000 (12:53 +0000)]
am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit '8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
  Import translations. DO NOT MERGE

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 agoam 974dfc1f: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 12:23:45 +0000 (12:23 +0000)]
am 974dfc1f: (-s ours) Import translations. DO NOT MERGE

* commit '974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
  Import translations. DO NOT MERGE

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 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd...
Geoff Mendal [Mon, 12 Oct 2015 13:11:42 +0000 (13:11 +0000)]
am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE

* commit '1bd19dd17e2038df6c374ca6ed48498de4dde730':
  Import translations. DO NOT MERGE

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 agoam f598d0bc: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 12 Oct 2015 12:30:37 +0000 (12:30 +0000)]
am f598d0bc: (-s ours) Import translations. DO NOT MERGE

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

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 ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d...
Geoff Mendal [Wed, 7 Oct 2015 13:01:25 +0000 (13:01 +0000)]
am ad36aa0e: (-s ours) am 3963b980: (-s ours) am 793b2a2d: (-s ours) am d4fd061d: (-s ours) Import translations. DO NOT MERGE

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

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 agoam b4a027d0: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Oct 2015 12:41:35 +0000 (12:41 +0000)]
am b4a027d0: (-s ours) Import translations. DO NOT MERGE

* commit 'b4a027d07bdd6b488a0ca576f7369beb0cad17c6':
  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 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376...
Geoff Mendal [Mon, 5 Oct 2015 12:55:55 +0000 (12:55 +0000)]
am 03226257: (-s ours) am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE

* commit '032262578565c928b47996d096f3518cf1f09aa7':
  Import translations. DO NOT MERGE

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 agoam 010d2fcd: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 12:32:07 +0000 (12:32 +0000)]
am 010d2fcd: (-s ours) Import translations. DO NOT MERGE

* commit '010d2fcd2a4b8fda906ff0a0e04554475a45489c':
  Import translations. DO NOT MERGE

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 dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2...
Geoff Mendal [Wed, 30 Sep 2015 12:57:33 +0000 (12:57 +0000)]
am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE

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

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 agoam 77fc6ac5: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 30 Sep 2015 12:27:22 +0000 (12:27 +0000)]
am 77fc6ac5: (-s ours) Import translations. DO NOT MERGE

* commit '77fc6ac5f6bb2c059f15b0bc9fd1ff02102b02fa':
  Import translations. DO NOT MERGE

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 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1...
Baligh Uddin [Sun, 27 Sep 2015 03:10:00 +0000 (03:10 +0000)]
am 4fdde2b5: (-s ours) am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGE

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

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 ec981982: (-s ours) am 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import translati...
Baligh Uddin [Sun, 27 Sep 2015 03:03:44 +0000 (03:03 +0000)]
am ec981982: (-s ours) am 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import translations. DO NOT MERGE

* commit 'ec9819828df47813168d99fd2905b98a230a5d6f':
  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