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

Eric Fischer [Mon, 11 Apr 2011 21:28:21 +0000 (14:28 -0700)]

am 2439b7c0: (-s ours) am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread

* commit '2439b7c00d86fb490b48e2bc0927fd581bf59e0e':
Reimport Settings translations. DO NOT MERGE

commit | commitdiff | tree

Simon Wilson [Mon, 11 Apr 2011 21:28:20 +0000 (14:28 -0700)]

am 719e1e43: (-s ours) am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit '719e1e43173155cbe0d77298c3d1ca05f143048b':
DO NOT MERGE Put additional update package names in config.xml

commit | commitdiff | tree

Eric Fischer [Mon, 11 Apr 2011 21:28:18 +0000 (14:28 -0700)]

am 1985e381: (-s ours) am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"

* commit '1985e381cbcb817adc26f4f612f96583b692e397':
Revert "Import revised translations. DO NOT MERGE"

commit | commitdiff | tree

Eric Fischer [Mon, 11 Apr 2011 21:24:30 +0000 (14:24 -0700)]

am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread

* commit '84c90053751ae1bcb07a845f5ac9747a808198b1':
Reimport Settings translations. DO NOT MERGE

commit | commitdiff | tree

Simon Wilson [Mon, 11 Apr 2011 21:24:28 +0000 (14:24 -0700)]

am 2ca7add5: (-s ours) am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit '2ca7add59f2437c4584029ba081bd4d222445ff9':
DO NOT MERGE Put additional update package names in config.xml

commit | commitdiff | tree

Eric Fischer [Mon, 11 Apr 2011 21:24:25 +0000 (14:24 -0700)]

am 6735ae14: (-s ours) am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"

* commit '6735ae141fee012409a2eaa0310538f3b0173263':
Revert "Import revised translations. DO NOT MERGE"

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 19:49:00 +0000 (12:49 -0700)]

am fc52971f: am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit 'fc52971f7e0e4409d4a78686e23a5e330e559fb8':
HDCP debugging in setting app part 2 of 2

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 19:46:36 +0000 (12:46 -0700)]

am b72f1b0f: am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit 'b72f1b0f45401a3fb8abe8e5e40eb5eab12e2710':
HDCP debugging in setting app part 2 of 2

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 19:43:22 +0000 (12:43 -0700)]

am 858fd9a0: HDCP debugging in setting app part 2 of 2

* commit '858fd9a0302c6d34781133137a048a9bf668632a':
HDCP debugging in setting app part 2 of 2

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 18:11:56 +0000 (11:11 -0700)]

HDCP debugging in setting app part 2 of 2

Change-Id: I931c50938526adce521a7bf02301aba75abaacaf

commit | commitdiff | tree

Brian Carlstrom [Fri, 8 Apr 2011 17:28:37 +0000 (10:28 -0700)]

Merge "Tolerate missing AccountManager resource, not just missing resource name"

commit | commitdiff | tree

Joe Onorato [Fri, 8 Apr 2011 01:41:13 +0000 (18:41 -0700)]

Remove the deprecated things from Config.java. These havent been working since before 1.0.

Change-Id: I88ea860fd6edf7c128cf1a201329f09428ab382c

commit | commitdiff | tree

Eric Fischer [Thu, 7 Apr 2011 21:08:01 +0000 (14:08 -0700)]

Merge "Import revised translations."

commit | commitdiff | tree

Eric Fischer [Thu, 7 Apr 2011 20:59:28 +0000 (13:59 -0700)]

Import revised translations.

Change-Id: I176df34d590daa670ac132759d7f4cb91e4b3747

commit | commitdiff | tree

Brian Carlstrom [Mon, 14 Feb 2011 18:16:39 +0000 (10:16 -0800)]

Tolerate missing AccountManager resource, not just missing resource name

Change-Id: I29ceed33a9cc8e697bfd3226f6ec58291c36daae

commit | commitdiff | tree

Joe Onorato [Thu, 7 Apr 2011 01:45:33 +0000 (18:45 -0700)]

Merge "advanced settings"

commit | commitdiff | tree

Joe Onorato [Thu, 7 Apr 2011 01:26:20 +0000 (18:26 -0700)]

advanced settings

Change-Id: Ibc3889e2ab0569f851ec46fe4d1cb1b4920ea5be

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 21:21:43 +0000 (14:21 -0700)]

am 94cdd67d: (-s ours) am 84edd9d5: am 8214c76e: Import revised translations. DO NOT MERGE

* commit '94cdd67dcf67b5c25bc063d887bdb1e5864cd35d':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 21:19:10 +0000 (14:19 -0700)]

am 84edd9d5: am 8214c76e: Import revised translations. DO NOT MERGE

* commit '84edd9d5281cb8e03ea31631aa232b8458136f32':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 21:16:10 +0000 (14:16 -0700)]

am 8214c76e: Import revised translations. DO NOT MERGE

* commit '8214c76e27de37a663cf8ce7a30091bf23c9be02':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 20:51:27 +0000 (13:51 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I5096f0341965e767187b8444f93804cad934ada9

commit | commitdiff | tree

Eric Fischer [Tue, 5 Apr 2011 17:26:27 +0000 (10:26 -0700)]

am b7185a54: (-s ours) am dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE

* commit 'b7185a549ca04c098ce050fa1da172a06ecdf230':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 5 Apr 2011 00:42:55 +0000 (17:42 -0700)]

am dfb78827: (-s ours) am 955ab98f: Import revised translations. DO NOT MERGE

* commit 'dfb78827767e14c8db205d8a7200f3f4025a0831':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Mon, 4 Apr 2011 21:43:04 +0000 (14:43 -0700)]

am fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread

* commit 'fcb089c94280dd3b5a1ed8f90610d258a43abb78':
Reimport Settings translations. DO NOT MERGE

commit | commitdiff | tree

Simon Wilson [Mon, 4 Apr 2011 21:43:02 +0000 (14:43 -0700)]

am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
DO NOT MERGE Put additional update package names in config.xml

commit | commitdiff | tree

Eric Fischer [Mon, 4 Apr 2011 21:42:59 +0000 (14:42 -0700)]

am b4bd78f5: Revert "Import revised translations. DO NOT MERGE"

* commit 'b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
Revert "Import revised translations. DO NOT MERGE"

commit | commitdiff | tree

Eric Fischer [Mon, 4 Apr 2011 19:21:25 +0000 (12:21 -0700)]

am 955ab98f: Import revised translations. DO NOT MERGE

* commit '955ab98f030cd198d838bdff8768ff87a17be9a8':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Fri, 1 Apr 2011 23:52:28 +0000 (16:52 -0700)]

Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread

commit | commitdiff | tree

Simon Wilson [Fri, 1 Apr 2011 23:47:22 +0000 (16:47 -0700)]

Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

commit | commitdiff | tree

Eric Fischer [Fri, 1 Apr 2011 23:42:38 +0000 (16:42 -0700)]

Reimport Settings translations. DO NOT MERGE

Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a

commit | commitdiff | tree

Eric Fischer [Fri, 1 Apr 2011 23:12:35 +0000 (16:12 -0700)]

Revert "Import revised translations. DO NOT MERGE"

This reverts commit 955ab98f030cd198d838bdff8768ff87a17be9a8.

Bug 4204088 requires that these strings not be translated.

Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404

commit | commitdiff | tree

Simon Wilson [Fri, 1 Apr 2011 20:41:03 +0000 (13:41 -0700)]

DO NOT MERGE Put additional update package names in config.xml

Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.

Change-Id: I73056716156c580606433bb63abfdd35c1b9892a

commit | commitdiff | tree

Jim Miller [Thu, 31 Mar 2011 20:24:19 +0000 (13:24 -0700)]

Merge "Fix LockScreen Settings on phones."

commit | commitdiff | tree

Jim Miller [Thu, 31 Mar 2011 04:16:48 +0000 (21:16 -0700)]

Fix LockScreen Settings on phones.

Change-Id: Ibbb0bcb4f34ba442d9ec678277718d3141f9d807

commit | commitdiff | tree

Park Sanghyun [Wed, 30 Mar 2011 23:40:49 +0000 (16:40 -0700)]

am ebfc5e3e: (-s ours) am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit 'ebfc5e3ed65d3d015b50372fb216782c4af7a3ac':
DO NOT MERGE Add support for additional System Update menu item

commit | commitdiff | tree

Kenny Root [Wed, 30 Mar 2011 23:38:52 +0000 (16:38 -0700)]

am 42f178d1: resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

* commit '42f178d10bcad0a8c04f20b2dfd2e3c28117a7cf':
Settings: Improved UX when viewing open source license info.

commit | commitdiff | tree

Park Sanghyun [Wed, 30 Mar 2011 22:29:48 +0000 (15:29 -0700)]

am 2b2959b3: (-s ours) am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit '2b2959b32141e86a0de880ded77c3ef63a081e0f':
DO NOT MERGE Add support for additional System Update menu item

commit | commitdiff | tree

Kenny Root [Wed, 30 Mar 2011 16:36:19 +0000 (09:36 -0700)]

resolved conflicts for merge of 70a1ff03 to honeycomb-plus-aosp

Change-Id: I1df4d790b070acbf89b9ee16bd750918486fce58

commit | commitdiff | tree

Park Sanghyun [Wed, 30 Mar 2011 16:31:15 +0000 (09:31 -0700)]

am e5da8565: DO NOT MERGE Add support for additional System Update menu item

* commit 'e5da8565ca7930483c2e8c6467710716cf51ba51':
DO NOT MERGE Add support for additional System Update menu item

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 23:59:28 +0000 (16:59 -0700)]

am f701fd1a: (-s ours) am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE

* commit 'f701fd1a962180b75531bea555ff9e60ff2647dc':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Kenny Root [Tue, 29 Mar 2011 22:43:38 +0000 (15:43 -0700)]

am 7fceefa7: Merge "Settings: Improved UX when viewing open source license info."

* commit '7fceefa79229ece2efab0446841543a8f8f20a1d':
Settings: Improved UX when viewing open source license info.

commit | commitdiff | tree

Kenny Root [Tue, 29 Mar 2011 22:03:25 +0000 (15:03 -0700)]

Merge "Settings: Improved UX when viewing open source license info."

commit | commitdiff | tree

Henrik Carlsson [Fri, 3 Sep 2010 09:08:19 +0000 (11:08 +0200)]

Settings: Improved UX when viewing open source license info.

Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.

Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 21:19:44 +0000 (14:19 -0700)]

am 573235d9: am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE

* commit '573235d9a73efdf3af066e47803a6c24382e6979':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 21:15:16 +0000 (14:15 -0700)]

am 142f4533: am 429687b9: (-s ours) Import revised translations. DO NOT MERGE

* commit '142f453399a123a3f9c046f5cec626b7e7d6facd':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 21:07:12 +0000 (14:07 -0700)]

am 429687b9: (-s ours) Import revised translations. DO NOT MERGE

* commit '429687b9ceace0d7fab9aa65c9d93e8f3eec93ba':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 20:36:41 +0000 (13:36 -0700)]

am 823a6ee9: am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit '823a6ee9ec95e0278ae77b37392c873e86bfe071':
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 20:34:20 +0000 (13:34 -0700)]

am e9fdee0e: am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit 'e9fdee0ed0ca2f2e0e83cda161906ca3a0a673a6':
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 20:32:59 +0000 (13:32 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Id19c294af4493e0d47193ab3477d5c0a1c068669

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 20:31:54 +0000 (13:31 -0700)]

am 81cb6be8: Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

* commit '81cb6be834f4604f6b58d8516f2b8e12620a3d16':
Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 20:28:48 +0000 (13:28 -0700)]

Merge "Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices." into honeycomb-mr1

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 19:28:04 +0000 (12:28 -0700)]

am c091a927: (-s ours) am 388fc081: am 3b4b91d4: Import revised translations. DO NOT MERGE

* commit 'c091a9273d19efcdf29d6ec87fb02bc65ad097e1':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 19:24:35 +0000 (12:24 -0700)]

am 388fc081: am 3b4b91d4: Import revised translations. DO NOT MERGE

* commit '388fc081bcca23525fa5a7cea58b8d4ae794d69c':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 19:19:35 +0000 (12:19 -0700)]

am 3b4b91d4: Import revised translations. DO NOT MERGE

* commit '3b4b91d43de5be5f920b7ed931c942817970e336':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 19:00:36 +0000 (12:00 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ic677ab3652341f1ef35a068f7290e15145172f37

commit | commitdiff | tree

Eric Fischer [Tue, 29 Mar 2011 17:58:24 +0000 (10:58 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4

commit | commitdiff | tree

Jake Hamby [Tue, 29 Mar 2011 03:25:23 +0000 (20:25 -0700)]

Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

Fix NPE when entering Settings app in the SDK (and for devices without
Bluetooth). Also remove the "Bluetooth settings" item in addition to
the Bluetooth toggle item from Wireless settings when BT is missing.

Bug: 4149307
Change-Id: Iecc5960a193cf88664d3217b4d7bdbc2276dabc0

commit | commitdiff | tree

Park Sanghyun [Fri, 25 Mar 2011 07:23:59 +0000 (16:23 +0900)]

DO NOT MERGE Add support for additional System Update menu item

Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915

commit | commitdiff | tree

Amith Yamasani [Wed, 23 Mar 2011 23:03:34 +0000 (16:03 -0700)]

am ce0976cc: am 2ba97451: am f3b325f5: Debug feature for HDCP compliance testing.

* commit 'ce0976cccd8a283689b15e33ce2cfaf819620bf6':
Debug feature for HDCP compliance testing.

commit | commitdiff | tree

Amith Yamasani [Wed, 23 Mar 2011 22:53:22 +0000 (15:53 -0700)]

am 2ba97451: am f3b325f5: Debug feature for HDCP compliance testing.

* commit '2ba9745180b2bb3400d0e1376552902d1b27c89a':
Debug feature for HDCP compliance testing.

commit | commitdiff | tree

Amith Yamasani [Wed, 23 Mar 2011 22:47:40 +0000 (15:47 -0700)]

am f3b325f5: Debug feature for HDCP compliance testing.

* commit 'f3b325f54dadb482d73111ab17cf6a51784de11a':
Debug feature for HDCP compliance testing.

commit | commitdiff | tree

Amith Yamasani [Wed, 23 Mar 2011 19:49:20 +0000 (12:49 -0700)]

Debug feature for HDCP compliance testing.

Bug: 4149811

Add a setting in Application->Development to change HDCP checking.

Change-Id: I5561b097b3fd7dbfc4eaf1977b80a37fc29572aa

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 02:36:15 +0000 (19:36 -0700)]

am d6f9c32b: am e2d30184: am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1

* commit 'd6f9c32b5691d62c157a30e295211114d401a8d9':
Fix ANR with bypass proxy regex

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 02:34:46 +0000 (19:34 -0700)]

am e2d30184: am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1

* commit 'e2d301842807bc7f1ea13672a685e5f83824140f':
Fix ANR with bypass proxy regex

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 02:33:16 +0000 (19:33 -0700)]

am 6864195a: Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1

* commit '6864195aa0195831a0cfbe92cd37f76c09df43b8':
Fix ANR with bypass proxy regex

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 02:30:22 +0000 (19:30 -0700)]

Merge "Fix ANR with bypass proxy regex" into honeycomb-mr1

commit | commitdiff | tree

Irfan Sheriff [Wed, 23 Mar 2011 00:19:05 +0000 (17:19 -0700)]

Fix ANR with bypass proxy regex

Bug: 4148297
Change-Id: I5519ed297acabb65e1992c65e4b4110380983bb1

commit | commitdiff | tree

Eric Fischer [Tue, 22 Mar 2011 21:06:29 +0000 (14:06 -0700)]

am a02d1a8a: (-s ours) am 3b9fa42b: am 36f7f4a7: Import revised translations. DO NOT MERGE

* commit 'a02d1a8a90908bbe04186d8f15af2ae4cd9381ec':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 22 Mar 2011 21:04:17 +0000 (14:04 -0700)]

am 3b9fa42b: am 36f7f4a7: Import revised translations. DO NOT MERGE

* commit '3b9fa42b6bfab20022cb5760cf41a3000325bc0c':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 22 Mar 2011 21:01:54 +0000 (14:01 -0700)]

am 36f7f4a7: Import revised translations. DO NOT MERGE

* commit '36f7f4a773b19121850699ca5b617fe3a1c6bd16':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 22 Mar 2011 20:39:43 +0000 (13:39 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I889f8414c773a57bd38d30c0b60a51216ef00b1b

commit | commitdiff | tree

Eric Fischer [Sat, 19 Mar 2011 00:05:14 +0000 (17:05 -0700)]

am 5ea56365: (-s ours) am 9567622d: (-s ours) am c4eeeb29: Import revised translations. DO NOT MERGE

* commit '5ea56365c5d3f731194e7eb88726968dfa53a4f0':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Fri, 18 Mar 2011 23:58:12 +0000 (16:58 -0700)]

am 9567622d: (-s ours) am c4eeeb29: Import revised translations. DO NOT MERGE

* commit '9567622d32e322ce866969c38ba19dfb882752d5':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Fri, 18 Mar 2011 23:52:30 +0000 (16:52 -0700)]

am c4eeeb29: Import revised translations. DO NOT MERGE

* commit 'c4eeeb29c5c72d9ceb16c373c4d3902c155a0f26':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Fri, 18 Mar 2011 22:17:01 +0000 (15:17 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1

commit | commitdiff | tree

Dianne Hackborn [Fri, 18 Mar 2011 19:29:41 +0000 (12:29 -0700)]

Update to follow API change.

Change-Id: I4d65d3a8847597cdb390c22f0ee20bd5ce028509

commit | commitdiff | tree

Eric Fischer [Fri, 18 Mar 2011 00:30:25 +0000 (17:30 -0700)]

Merge "Import revised translations."

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 23:55:36 +0000 (16:55 -0700)]

Import revised translations.

Change-Id: I8146c6ff4e2c5d8cdcc9b82cf38d2baac89853f5

commit | commitdiff | tree

TK MUN [Thu, 17 Mar 2011 23:31:22 +0000 (16:31 -0700)]

am 8c1d9468: (-s ours) am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"

* commit '8c1d9468ee63734365184d5d7517df54ba6e4cb1':
DO NOT MERGE Do not allow shortcut for "4G Settings"

commit | commitdiff | tree

TK MUN [Thu, 17 Mar 2011 23:27:29 +0000 (16:27 -0700)]

am 8c2a02de: (-s ours) am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"

* commit '8c2a02defc4139b2532861602d8e2816018f53b9':
DO NOT MERGE Do not allow shortcut for "4G Settings"

commit | commitdiff | tree

TK MUN [Thu, 17 Mar 2011 23:20:42 +0000 (16:20 -0700)]

am e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"

* commit 'e0e845fee6703a1a2ed75c4fe67cb0202dd076c0':
DO NOT MERGE Do not allow shortcut for "4G Settings"

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 20:37:09 +0000 (13:37 -0700)]

am bb8af31f: (-s ours) am 1a04c21b: am 7f050e2e: Import revised translations. DO NOT MERGE

* commit 'bb8af31f860a4546dbb6503325f2bd25ea4a7de9':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 20:34:44 +0000 (13:34 -0700)]

am 1a04c21b: am 7f050e2e: Import revised translations. DO NOT MERGE

* commit '1a04c21b5ae872a5be7f533caa80b6bb87e14b0c':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 20:32:23 +0000 (13:32 -0700)]

am 7f050e2e: Import revised translations. DO NOT MERGE

* commit '7f050e2ef8e1593d8a89f9d3357015c5eb1b8764':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 20:13:20 +0000 (13:13 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I6302e63ef939e3b0c14f1223121934ee0a5f1e14

commit | commitdiff | tree

TK MUN [Wed, 16 Mar 2011 07:04:54 +0000 (16:04 +0900)]

DO NOT MERGE Do not allow shortcut for "4G Settings"

Settings shortcuts are only for the modules inside the settings
application. The pathclassloader is /system/app/Settings.apk for
all the settings shortcuts. Since 4G settings is outside of
Settings.apk, we cannot support a shortcut for this.

Change-Id: I1b5523618ef5e8eea8535793f3a983e6ba21d551

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 00:12:09 +0000 (17:12 -0700)]

am 43f36859: (-s ours) am dd68cde8: am 24d61952: Import revised translations. DO NOT MERGE

* commit '43f3685910399716ffea76a91e6116a6ce37b3dc':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 00:09:45 +0000 (17:09 -0700)]

am dd68cde8: am 24d61952: Import revised translations. DO NOT MERGE

* commit 'dd68cde8fe7195ec99f973f550dfb2737e9c630d':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 00:08:19 +0000 (17:08 -0700)]

am 24d61952: Import revised translations. DO NOT MERGE

* commit '24d6195266848c20cb0e2b0a737b9c2871f68346':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Thu, 17 Mar 2011 00:01:59 +0000 (17:01 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: Ia5e71db67c6c9985d6b0c72c482cc45cd0563927

commit | commitdiff | tree

Eric Fischer [Wed, 16 Mar 2011 18:00:30 +0000 (11:00 -0700)]

am 79c42480: (-s ours) am d1a2e38a: am d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

* commit '79c424805d5710994795797033cdfe901f5e7292':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 16 Mar 2011 17:54:24 +0000 (10:54 -0700)]

am d1a2e38a: am d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

* commit 'd1a2e38ae2c8d64b7fadc979ac7a58c138809745':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 16 Mar 2011 17:51:39 +0000 (10:51 -0700)]

am d2f68160: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

* commit 'd2f68160437d1e84cd6d320fbad3e84e8955099a':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 16 Mar 2011 17:21:43 +0000 (10:21 -0700)]

Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

commit | commitdiff | tree

Eric Fischer [Wed, 16 Mar 2011 17:14:34 +0000 (10:14 -0700)]

Import revised translations. DO NOT MERGE

Change-Id: I14c07d29f1cea3cedb6e9b0492d549e692c72612

commit | commitdiff | tree

Justin Ho [Wed, 16 Mar 2011 06:50:31 +0000 (23:50 -0700)]

am 7f9f83fc: am dce7719c: am dc4f7ac4: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1

* commit '7f9f83fc894f46cc55cc1927e33160d3492382bb':
Flip the icon states for Bluetooth profile auto-connect settings

commit | commitdiff | tree

Justin Ho [Wed, 16 Mar 2011 06:47:11 +0000 (23:47 -0700)]

am dce7719c: am dc4f7ac4: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1

* commit 'dce7719cb86104920ce0305bb4f5971dc18374b3':
Flip the icon states for Bluetooth profile auto-connect settings

commit | commitdiff | tree

Justin Ho [Wed, 16 Mar 2011 06:44:05 +0000 (23:44 -0700)]

am dc4f7ac4: Merge "Flip the icon states for Bluetooth profile auto-connect settings" into honeycomb-mr1

* commit 'dc4f7ac40112f1cace8bb335d12b8164752527d5':
Flip the icon states for Bluetooth profile auto-connect settings

commit | commitdiff | tree

Eric Fischer [Wed, 16 Mar 2011 06:34:02 +0000 (23:34 -0700)]

am a92c00e9: (-s ours) am 69720655: am 9a81c122: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

* commit 'a92c00e995ae63e938961cecac9984e48bf781e6':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 16 Mar 2011 06:31:53 +0000 (23:31 -0700)]

am 69720655: am 9a81c122: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

* commit '69720655fdbcffeb34deb03e767007cc20a0f525':
Import revised translations. DO NOT MERGE