git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Geoff Mendal [Mon, 13 Oct 2014 20:03:15 +0000 (13:03 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Alan Viverette [Sat, 11 Oct 2014 05:02:46 +0000 (05:02 +0000)]

am 81db2fe7: am 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '81db2fe78a02c3f01afde9e05f5594c3f2ebb80b':
Add option for serif monospace captioning font

commit | commitdiff | tree

Amit Mahajan [Sat, 11 Oct 2014 05:02:46 +0000 (05:02 +0000)]

am 9530280c: am 63fce990: am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev

* commit '9530280c1bc2b9ac22a3c1db94c76dbcf8a94917':
Fix to show signal strength as 0 if out of service.

commit | commitdiff | tree

Alan Viverette [Sat, 11 Oct 2014 04:54:56 +0000 (04:54 +0000)]

am 44da5c19: am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '44da5c19dbe7d438e9601477a17041b4a7700631':
Add option for serif monospace captioning font

commit | commitdiff | tree

Amit Mahajan [Sat, 11 Oct 2014 04:54:55 +0000 (04:54 +0000)]

am 63fce990: am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev

* commit '63fce990971121eb74fb64a79807223fb3f36cf8':
Fix to show signal strength as 0 if out of service.

commit | commitdiff | tree

Alan Viverette [Sat, 11 Oct 2014 03:17:23 +0000 (03:17 +0000)]

am 4ed4249c: am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '4ed4249ccd9de8f34a7d59ab48b28494ff942d53':
Add option for serif monospace captioning font

commit | commitdiff | tree

Amit Mahajan [Sat, 11 Oct 2014 03:17:20 +0000 (03:17 +0000)]

am 5c340458: am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev

* commit '5c340458fdebc191d70f33913594e9e3429fc5d2':
Fix to show signal strength as 0 if out of service.

commit | commitdiff | tree

Alan Viverette [Sat, 11 Oct 2014 02:49:47 +0000 (02:49 +0000)]

am 87b151c6: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '87b151c65090dfbfcfe09c884377cedd7fd3a34b':
Add option for serif monospace captioning font

commit | commitdiff | tree

Amit Mahajan [Sat, 11 Oct 2014 02:49:38 +0000 (02:49 +0000)]

am 8151ef29: resolved conflicts for merge of 88b2790d to lmp-sprout-dev

* commit '8151ef29aa80006b7597ed57d507fe48338110c7':
Fix to show signal strength as 0 if out of service.

commit | commitdiff | tree

Alan Viverette [Sat, 11 Oct 2014 00:23:54 +0000 (00:23 +0000)]

am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev

* commit '178db4d5f7522a81ee5cce02ccbb080c2e555697':
Add option for serif monospace captioning font

commit | commitdiff | tree

Amit Mahajan [Sat, 11 Oct 2014 00:15:48 +0000 (17:15 -0700)]

resolved conflicts for merge of 88b2790d to lmp-sprout-dev

Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903

commit | commitdiff | tree

Alan Viverette [Fri, 10 Oct 2014 23:40:58 +0000 (23:40 +0000)]

Merge "Add option for serif monospace captioning font" into lmp-dev

commit | commitdiff | tree

Amit Mahajan [Fri, 10 Oct 2014 22:41:08 +0000 (22:41 +0000)]

Merge "Fix to show signal strength as 0 if out of service." into lmp-dev

commit | commitdiff | tree

Amit Mahajan [Fri, 10 Oct 2014 21:23:22 +0000 (14:23 -0700)]

Fix to show signal strength as 0 if out of service.

Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a

commit | commitdiff | tree

Alan Viverette [Fri, 10 Oct 2014 19:24:45 +0000 (12:24 -0700)]

Add option for serif monospace captioning font

BUG: 17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da

commit | commitdiff | tree

Dianne Hackborn [Fri, 10 Oct 2014 18:41:57 +0000 (18:41 +0000)]

am eac414ae: am 9d49e51c: am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit 'eac414ae23a2b0db870ca5ed82b2900aa18e38cc':
Update to use "real" L codename.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 10 Oct 2014 18:41:56 +0000 (18:41 +0000)]

am ac8a4c07: am e807e1ea: am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only

* commit 'ac8a4c0762df40b5525eadad4f979ae38ab78229':
Remove CA Cert UI item from one list only

commit | commitdiff | tree

Svetoslav [Fri, 10 Oct 2014 18:41:55 +0000 (18:41 +0000)]

am aaeaa9da: am a883dbba: am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev

* commit 'aaeaa9dadc004929b2fb4ee5e21c2099ec36cbbd':
Update accessibility service toggle switch when resuming.

commit | commitdiff | tree

Dianne Hackborn [Fri, 10 Oct 2014 17:01:10 +0000 (17:01 +0000)]

am 9d49e51c: am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit '9d49e51c854bb25d50c2aefd66aeed6aeb942d2c':
Update to use "real" L codename.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 10 Oct 2014 16:59:44 +0000 (16:59 +0000)]

am e807e1ea: am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only

* commit 'e807e1ead6f78951b8b84d55f8772d0317f09f14':
Remove CA Cert UI item from one list only

commit | commitdiff | tree

Svetoslav [Fri, 10 Oct 2014 16:58:15 +0000 (16:58 +0000)]

am a883dbba: am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev

* commit 'a883dbba7194b19c14c4fff83f94ee852c7bb798':
Update accessibility service toggle switch when resuming.

commit | commitdiff | tree

Sanket Padawe [Fri, 10 Oct 2014 05:15:52 +0000 (05:15 +0000)]

am ce1bfbb0: resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
Removing display number format from SIM UI

commit | commitdiff | tree

Sanket Padawe [Fri, 10 Oct 2014 03:19:59 +0000 (20:19 -0700)]

resolved conflicts for merge of 61719a80 to lmp-mr1-dev-plus-aosp

Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80

commit | commitdiff | tree

Dianne Hackborn [Thu, 9 Oct 2014 22:11:49 +0000 (22:11 +0000)]

am c30661c0: am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit 'c30661c05d2455d251f8cedddc3a048e78455f6c':
Update to use "real" L codename.

commit | commitdiff | tree

Dianne Hackborn [Thu, 9 Oct 2014 22:02:02 +0000 (22:02 +0000)]

am 8541206e: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit '8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
Update to use "real" L codename.

commit | commitdiff | tree

Dianne Hackborn [Thu, 9 Oct 2014 19:29:33 +0000 (19:29 +0000)]

am a4204bde: Merge "Update to use "real" L codename." into lmp-dev

* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
Update to use "real" L codename.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:28:05 +0000 (19:28 +0000)]

am 90625329: am 95dda800: am 50263efb: Remove CA Cert UI item from one list only

* commit '90625329608c19c3a0b8f7c98bb8710fe346a220':
Remove CA Cert UI item from one list only

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:22:48 +0000 (19:22 +0000)]

am 95dda800: am 50263efb: Remove CA Cert UI item from one list only

* commit '95dda800a988c1ca778dae08563b6875c30d089a':
Remove CA Cert UI item from one list only

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:11:25 +0000 (19:11 +0000)]

am 50263efb: Remove CA Cert UI item from one list only

* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
Remove CA Cert UI item from one list only

commit | commitdiff | tree

Svetoslav [Thu, 9 Oct 2014 18:26:25 +0000 (18:26 +0000)]

am 39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev

* commit '396748110b8e7e761ee1d82827cc4396ecc5ee66':
Update accessibility service toggle switch when resuming.

commit | commitdiff | tree

Svetoslav [Thu, 9 Oct 2014 18:21:53 +0000 (18:21 +0000)]

Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev

commit | commitdiff | tree

Dianne Hackborn [Thu, 9 Oct 2014 16:54:16 +0000 (16:54 +0000)]

Merge "Update to use "real" L codename." into lmp-dev

commit | commitdiff | tree

Sanket Padawe [Thu, 9 Oct 2014 13:16:15 +0000 (13:16 +0000)]

am 04b8b4c1: am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev

* commit '04b8b4c1a46dad57923ddbbb1522e8c21d0757f7':
Removing display number format from SIM UI

commit | commitdiff | tree

Sanket Padawe [Thu, 9 Oct 2014 13:03:33 +0000 (13:03 +0000)]

am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev

* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
Removing display number format from SIM UI

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 9 Oct 2014 12:00:32 +0000 (13:00 +0100)]

Remove CA Cert UI item from one list only

When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.

Bug: 17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6

commit | commitdiff | tree

Sanket Padawe [Thu, 9 Oct 2014 00:33:10 +0000 (00:33 +0000)]

Merge "Removing display number format from SIM UI" into lmp-sprout-dev

commit | commitdiff | tree

Sanket Padawe [Wed, 8 Oct 2014 22:41:41 +0000 (15:41 -0700)]

Removing display number format from SIM UI

Removed "Display Number" from the SIM settings UI.

Change-Id: Ib2b228931dfac56503ac56ffdf2238e6f416a469

commit | commitdiff | tree

Dianne Hackborn [Wed, 8 Oct 2014 16:38:36 +0000 (09:38 -0700)]

Update to use "real" L codename.

Change-Id: If7112bc4a41007bd3dbcb2b4d2c9ff9e44f7cf0c

commit | commitdiff | tree

Svetoslav [Wed, 8 Oct 2014 19:29:12 +0000 (12:29 -0700)]

Update accessibility service toggle switch when resuming.

An accessibility service can be enabled via a global gesture
in which case if the settings activity for enabling the service
is running its toggle switch is shown in the wrong state.

bug:16558106

Change-Id: I2821b148475a7afae21e29148ef98db724c817f2

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Oct 2014 20:41:15 +0000 (20:41 +0000)]

am 711785f5: am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '711785f59cfe9aeb71e686bd7f45781bd545472c':
Set default restrictions for a newly created user

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Oct 2014 20:34:51 +0000 (20:34 +0000)]

am 436796e4: am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '436796e4ccf327c09e104a5bda27788a029c85e7':
Set default restrictions for a newly created user

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Oct 2014 20:08:32 +0000 (20:08 +0000)]

am 6b911d59: am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '6b911d59eb2da863c53e5e338dec22974a79b654':
Set default restrictions for a newly created user

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Oct 2014 20:03:26 +0000 (20:03 +0000)]

am c55c581a: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit 'c55c581a8a9c7fb777e80498852426a546b1504c':
Set default restrictions for a newly created user

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Oct 2014 19:58:24 +0000 (19:58 +0000)]

am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev

* commit '742a6803c31692f6cf0b36ef934cf1e9bc9b01d8':
Set default restrictions for a newly created user

commit | commitdiff | tree

Amith Yamasani [Tue, 7 Oct 2014 17:41:09 +0000 (17:41 +0000)]

Merge "Set default restrictions for a newly created user" into lmp-dev

commit | commitdiff | tree

Amith Yamasani [Mon, 6 Oct 2014 21:16:11 +0000 (14:16 -0700)]

Set default restrictions for a newly created user

Call a different createUser version that sets up the defaults.
Make sure any previously created guest also gets the restrictions
as soon as they are changed.

Bug: 17832802
Bug: 17891763
Change-Id: I3eaa9e3da32b2f436699db24bb7be2668f1480b3

commit | commitdiff | tree

Mike Lockwood [Tue, 7 Oct 2014 17:12:20 +0000 (17:12 +0000)]

Merge "Add developer setting for changing the current USB configuration"

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 12:22:01 +0000 (12:22 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 01:03:43 +0000 (01:03 +0000)]

am 4813fcdd: (-s ours) am c22f63a7: (-s ours) am a6e09c12: (-s ours) am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '4813fcdd98041a39d0a55ac4a5feadd27ea72194':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 01:03:42 +0000 (01:03 +0000)]

am ea11d700: (-s ours) am 5df0bf9a: (-s ours) am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:56:05 +0000 (00:56 +0000)]

am c22f63a7: (-s ours) am a6e09c12: (-s ours) am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:56:04 +0000 (00:56 +0000)]

am 5df0bf9a: (-s ours) am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:40:13 +0000 (00:40 +0000)]

am a6e09c12: (-s ours) am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:40:12 +0000 (00:40 +0000)]

am c4fd0715: (-s ours) am c3cd6d95: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:32:21 +0000 (00:32 +0000)]

am 237abb0a: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '237abb0a373a3f9a9e70e7f11fbc77dd65dcf80f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:32:21 +0000 (00:32 +0000)]

am c3cd6d95: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:25:37 +0000 (00:25 +0000)]

am 6380422d: (-s ours) am 3a797b8b: (-s ours) am 78fb9572: (-s ours) Import translations. DO NOT MERGE

* commit '6380422d2553cbfb3901654cb68b0134fb4a8794':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:20:58 +0000 (00:20 +0000)]

am a5569d48: (-s ours) am b2bd24f1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:20:48 +0000 (17:20 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:18:58 +0000 (00:18 +0000)]

am 3a797b8b: (-s ours) am 78fb9572: (-s ours) Import translations. DO NOT MERGE

* commit '3a797b8bdb3f4d68e7483478030f704688169ea6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:13:09 +0000 (00:13 +0000)]

am b2bd24f1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:11:50 +0000 (00:11 +0000)]

am 78fb9572: (-s ours) Import translations. DO NOT MERGE

* commit '78fb95728d534a7099c220ea21fc13f3b52afd5f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:08:25 +0000 (00:08 +0000)]

am 7096c2dd: (-s ours) Import translations. DO NOT MERGE

* commit '7096c2dd0b1fadabe6f2bcb07ef5045405f2337f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:04:43 +0000 (17:04 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 7 Oct 2014 00:00:54 +0000 (17:00 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 6 Oct 2014 23:57:23 +0000 (16:57 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 6 Oct 2014 23:53:34 +0000 (16:53 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Mike Lockwood [Mon, 22 Sep 2014 19:15:24 +0000 (12:15 -0700)]

Add developer setting for changing the current USB configuration

This can be useful for testing the audio source kernel driver,
reverse tethering over RNDIS, etc.

Change-Id: I7392f95545cf5ae8a36b4b7b0d37f003df7e70b2

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:34:26 +0000 (18:34 +0000)]

am ace6ce94: (-s ours) am 04b3b84d: (-s ours) am 44705ba3: (-s ours) am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:30:05 +0000 (18:30 +0000)]

am 56ee8dda: (-s ours) am c683e91b: (-s ours) am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE

* commit '56ee8dda0d04f64a30ebdc65ce572752facd70e4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:29:10 +0000 (18:29 +0000)]

am 04b3b84d: (-s ours) am 44705ba3: (-s ours) am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE

* commit '04b3b84d30d723e71ea501b929f7b4af81e1150d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:23:50 +0000 (18:23 +0000)]

am 2856ab17: (-s ours) am 08edaf4a: (-s ours) am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE

* commit '2856ab17ef578ccb42f0ee7324a95121fb28ea7d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:23:42 +0000 (18:23 +0000)]

am 44705ba3: (-s ours) am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE

* commit '44705ba3c254b62c8ab95ef5d05a5c1e3c8c0a75':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:21:41 +0000 (18:21 +0000)]

am c683e91b: (-s ours) am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:19:28 +0000 (18:19 +0000)]

am a0f460e4: (-s ours) am 44a32145: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:17:26 +0000 (18:17 +0000)]

am b305e7ad: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:16:35 +0000 (18:16 +0000)]

am 08edaf4a: (-s ours) am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE

* commit '08edaf4a15d4b7e3f90902ed952b9ce3cf5b863f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:14:49 +0000 (18:14 +0000)]

am d10da630: (-s ours) am 4aed4235: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:12:01 +0000 (18:12 +0000)]

am 44a32145: (-s ours) Import translations. DO NOT MERGE

* commit '44a32145ca9400540c2fe82cad265bceb60d5f05':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:10:55 +0000 (18:10 +0000)]

am 43848de1: (-s ours) Import translations. DO NOT MERGE

* commit '43848de1603dc30e390049e2057285303132a836':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:10:03 +0000 (18:10 +0000)]

am f6a4f3e1: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:09:22 +0000 (18:09 +0000)]

am 4aed4235: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 18:06:24 +0000 (18:06 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 04:52:19 +0000 (21:52 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 04:38:39 +0000 (21:38 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 04:36:10 +0000 (21:36 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 04:33:29 +0000 (21:33 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Baligh Uddin [Sun, 5 Oct 2014 04:30:28 +0000 (21:30 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Elliott Hughes [Sat, 4 Oct 2014 16:43:09 +0000 (16:43 +0000)]

am 22ea4c41: resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp

* commit '22ea4c41ae79b52dac3d0c3789e6587bc4d6a43a':
Fix percentage formatting throughout Settings.

commit | commitdiff | tree

Elliott Hughes [Sat, 4 Oct 2014 16:38:07 +0000 (09:38 -0700)]

resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp

Change-Id: I21a6ffe22c40c5c308487926d26d28dcae7f186d

commit | commitdiff | tree

PauloftheWest [Sat, 4 Oct 2014 16:05:46 +0000 (16:05 +0000)]

am 1713fe25: am 0834ff0b: am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

* commit '1713fe2524361a2e10b877925bf93053a6cd173d':
[DS] DSDS support for Settings

commit | commitdiff | tree

PauloftheWest [Sat, 4 Oct 2014 15:45:10 +0000 (15:45 +0000)]

am 0834ff0b: am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

* commit '0834ff0b870d022f028a45a81ca5887eb99f4677':
[DS] DSDS support for Settings

commit | commitdiff | tree

Elliott Hughes [Sat, 4 Oct 2014 00:48:06 +0000 (00:48 +0000)]

am 50c377f0: Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev

* commit '50c377f09ffba10d7ff4787b7641aee4975c6f98':
Fix percentage formatting throughout Settings.

commit | commitdiff | tree

Elliott Hughes [Sat, 4 Oct 2014 00:44:10 +0000 (00:44 +0000)]

Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev

commit | commitdiff | tree

PauloftheWest [Sat, 4 Oct 2014 00:04:28 +0000 (00:04 +0000)]

am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

* commit '6ceaa82b5a188e2f000d2224f7fb8d6d4b9cf139':
[DS] DSDS support for Settings

commit | commitdiff | tree

Svetoslav [Sat, 4 Oct 2014 00:01:27 +0000 (00:01 +0000)]

am 4ab0396c: am 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages.

* commit '4ab0396c7fbb25033f7c81dc297bafb96778eb3a':
Update accessibility plus secure lock warning messages.

commit | commitdiff | tree

PauloftheWest [Fri, 3 Oct 2014 23:57:18 +0000 (23:57 +0000)]

am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

* commit '4046cf9cb46762a517b69c6cb78faa5903d6a3d5':
[DS] DSDS support for Settings

commit | commitdiff | tree

Elliott Hughes [Thu, 2 Oct 2014 23:36:32 +0000 (16:36 -0700)]

Fix percentage formatting throughout Settings.

Bug: 15476051
Change-Id: Ic64e7c36d0e2732d3e0e79fec2b79de42decf77d

commit | commitdiff | tree

PauloftheWest [Fri, 3 Oct 2014 22:45:26 +0000 (22:45 +0000)]

Merge "[DS] DSDS support for Settings" into lmp-sprout-dev

commit | commitdiff | tree

Svetoslav [Fri, 3 Oct 2014 22:39:26 +0000 (22:39 +0000)]

am 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages.

* commit '94c1f70c8833a5b7b3858213b7d8a30b647c1bb2':
Update accessibility plus secure lock warning messages.