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

am 3ad5cadc: (-s ours) am 6db7e9e0: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Wed, 21 Mar 2012 21:19:35 +0000 (14:19 -0700)]

am 6db7e9e0: Import translations. DO NOT MERGE

* commit '6db7e9e04318e431c3afad68daaeac555dc71783':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 21 Mar 2012 20:35:52 +0000 (13:35 -0700)]

Import translations. DO NOT MERGE

Change-Id: I12a6d9c821cdbe404d5962c998b357b35a976a29

commit | commitdiff | tree

Eric Fischer [Wed, 21 Mar 2012 20:34:02 +0000 (13:34 -0700)]

Import translations. DO NOT MERGE

Change-Id: I50955bd54ef21ed5489958e92d33d5ca7efddc4f

commit | commitdiff | tree

Eric Fischer [Wed, 21 Mar 2012 20:32:40 +0000 (13:32 -0700)]

Import translations. DO NOT MERGE

Change-Id: Id4ae315946f7c6f7c18ae263532a4cd42331ce29

commit | commitdiff | tree

Danielle Millett [Mon, 19 Mar 2012 22:05:26 +0000 (18:05 -0400)]

Added a liveliness check box preference for Face Unlock.

This will be used to enable or disable liveliness detection.

Change-Id: I0be735724aed4cadbd5c37d895a7f80ad4f4ee09

commit | commitdiff | tree

Eric Fischer [Wed, 21 Mar 2012 02:36:30 +0000 (19:36 -0700)]

am 2c95ab5e: (-s ours) am 5665cda1: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Eric Fischer [Wed, 21 Mar 2012 02:36:03 +0000 (19:36 -0700)]

am b22dff48: (-s ours) am 63cad3dd: Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Jason Chen [Wed, 21 Mar 2012 02:35:39 +0000 (19:35 -0700)]

am 3f49e65f: (-s ours) am b0362b1b: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit '3f49e65fc3de05bfb2e54d74f8366c6be342d0b4':

commit | commitdiff | tree

Jason Chen [Wed, 21 Mar 2012 01:20:37 +0000 (18:20 -0700)]

am 9b06ca94: (-s ours) am 8f393645: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit '9b06ca9476e93f4a4e86b84d080df35a333dc0ac':
[DO NOT MERGE] Revert "Update string in Settings"

commit | commitdiff | tree

Jason Chen [Wed, 21 Mar 2012 00:55:14 +0000 (17:55 -0700)]

am 3180a46c: am 0eb3a3fc: am 23d0b528: Update string in Settings

* commit '3180a46c4b2abaae0e9036b43dffee5884241b53':

commit | commitdiff | tree

Jason Chen [Wed, 21 Mar 2012 00:55:07 +0000 (17:55 -0700)]

am bb4133b1: am dd6c0d61: am 23d0b528: Update string in Settings

* commit 'bb4133b1f6c88cb5cf0232ef5febe470f2665257':
Update string in Settings

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Mar 2012 23:54:54 +0000 (16:54 -0700)]

Merge "Remember when NetworkPolicy was inferred."

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Mar 2012 23:52:43 +0000 (16:52 -0700)]

Remember when NetworkPolicy was inferred.

Change-Id: If2e8ba37fa166e1711650b87392af2ac3a418269

commit | commitdiff | tree

Irfan Sheriff [Tue, 20 Mar 2012 21:42:03 +0000 (14:42 -0700)]

Merge "Add static ip/proxy support for hidden networks"

commit | commitdiff | tree

Eric Fischer [Tue, 20 Mar 2012 21:33:54 +0000 (14:33 -0700)]

am 5665cda1: Import translations. DO NOT MERGE

* commit '5665cda1e1889af9bc7e48a0746f02cec3b17aef':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Tue, 20 Mar 2012 20:03:30 +0000 (13:03 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ifb30e3e67756e441d76309f567d195c96bd7818d

commit | commitdiff | tree

Eric Fischer [Tue, 20 Mar 2012 20:01:49 +0000 (13:01 -0700)]

Import translations. DO NOT MERGE

Change-Id: I0fdd1f06fb7783649795bac398e84c9be8658845

commit | commitdiff | tree

Eric Fischer [Tue, 20 Mar 2012 20:00:29 +0000 (13:00 -0700)]

Import translations. DO NOT MERGE

Change-Id: I98dc979933a9a014f3a405fd88bb8823e7a2f83d

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Mar 2012 02:25:17 +0000 (19:25 -0700)]

Merge "Enforcement control for READ_EXTERNAL permission."

commit | commitdiff | tree

Jeff Sharkey [Mon, 19 Mar 2012 23:54:07 +0000 (16:54 -0700)]

Enforcement control for READ_EXTERNAL permission.

Surface enforcement controls for READ_EXTERNAL_STORAGE permission
using new PackageManager API.

Bug: 6131916
Change-Id: I0ece4742666fda58e41410cb4b0b7175f280fa31

commit | commitdiff | tree

Irfan Sheriff [Tue, 13 Mar 2012 23:30:23 +0000 (16:30 -0700)]

Add static ip/proxy support for hidden networks

Add support for static ip and proxy. In the process, clean up the issues
that showed up during testing.

Bug: 5459872
Change-Id: I96c8fff816b6cbb485d2bb215349193e49f3d0b2

commit | commitdiff | tree

Eric Fischer [Mon, 19 Mar 2012 21:34:43 +0000 (14:34 -0700)]

am 63cad3dd: Import translations. DO NOT MERGE

* commit '63cad3dd8b06b0eff66be07815f1cfe54c5f7b76':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Mon, 19 Mar 2012 21:32:40 +0000 (14:32 -0700)]

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

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

commit | commitdiff | tree

Eric Fischer [Mon, 19 Mar 2012 21:32:26 +0000 (14:32 -0700)]

Import translations. DO NOT MERGE

Change-Id: I6d24d5dbde0bc089aa7e605f40ee902a42cb10b6

commit | commitdiff | tree

Eric Fischer [Mon, 19 Mar 2012 21:30:38 +0000 (14:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic36ea190bec85b32f7614ca2c329d6ff48f93d8a

commit | commitdiff | tree

Eric Fischer [Mon, 19 Mar 2012 21:29:16 +0000 (14:29 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib14c978b6abf1ac248953e2f4b03c71222b58c96

commit | commitdiff | tree

Eric Fischer [Mon, 19 Mar 2012 21:28:34 +0000 (14:28 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ie27bb5431e3356c30867fc25d00037b3b567da5c

commit | commitdiff | tree

Jason Chen [Sat, 17 Mar 2012 00:29:35 +0000 (17:29 -0700)]

am b0362b1b: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit 'b0362b1bb0a3288c8de2cd8d0e5efd44ec1a831e':

commit | commitdiff | tree

Jason Chen [Sat, 17 Mar 2012 00:27:13 +0000 (17:27 -0700)]

am 8f393645: am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit '8f393645e9b66235760c3e3c9b1dd9d999ed03f1':
[DO NOT MERGE] Revert "Update string in Settings"

commit | commitdiff | tree

Jason Chen [Sat, 17 Mar 2012 00:26:29 +0000 (17:26 -0700)]

am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
[DO NOT MERGE] Revert "Update string in Settings"

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 23:35:56 +0000 (16:35 -0700)]

am 80f2b063: (-s ours) am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit '80f2b06330accf1e4f51bc4846edf1e1409899f1':
[DO NOT MERGE] Revert "Update string in Settings"

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 23:33:10 +0000 (16:33 -0700)]

am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
[DO NOT MERGE] Revert "Update string in Settings"

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 23:32:30 +0000 (16:32 -0700)]

am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"

* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
[DO NOT MERGE] Revert "Update string in Settings"

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 23:18:51 +0000 (16:18 -0700)]

[DO NOT MERGE] Revert "Update string in Settings"

This reverts commit 23d0b5287a527379d7c52a971b7dfa8c1fc769e2.

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 21:21:08 +0000 (14:21 -0700)]

am 0eb3a3fc: am 23d0b528: Update string in Settings

* commit '0eb3a3fc4e25d4df6379d775269f561f66748c8d':

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 21:19:03 +0000 (14:19 -0700)]

am dd6c0d61: am 23d0b528: Update string in Settings

* commit 'dd6c0d61d7a3c605be2d402c3cd2586c539df81c':
Update string in Settings

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 21:16:49 +0000 (14:16 -0700)]

am 23d0b528: Update string in Settings

* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
Update string in Settings

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 21:16:17 +0000 (14:16 -0700)]

am 23d0b528: Update string in Settings

* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
Update string in Settings

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 21:16:17 +0000 (14:16 -0700)]

am 23d0b528: Update string in Settings

* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
Update string in Settings

commit | commitdiff | tree

Eric Fischer [Fri, 16 Mar 2012 21:11:46 +0000 (14:11 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8d12690747947a87a4fdcc6aa1b8e9c641802bf5

commit | commitdiff | tree

Jason Chen [Fri, 16 Mar 2012 18:29:01 +0000 (11:29 -0700)]

Update string in Settings

Bug: 6183254

Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128

commit | commitdiff | tree

Jeff Sharkey [Fri, 16 Mar 2012 01:41:26 +0000 (18:41 -0700)]

Merge "Auto grid lines, lower minimum, disable estimates."

commit | commitdiff | tree

Jeff Sharkey [Fri, 16 Mar 2012 01:38:13 +0000 (18:38 -0700)]

Auto grid lines, lower minimum, disable estimates.

Show automatic grid lines with power-of-two spacing, avoiding ANR
when trying to render thousands of gridlines. Lower minimum chart
height to 50MB to give better view of linear data. Also disable
estimates rendering.

Bug: 5500204, 6005240
Change-Id: Iacfed11b32c0095c9c2d08bee6a1b5e29637de98

commit | commitdiff | tree

Jeff Sharkey [Thu, 15 Mar 2012 23:57:51 +0000 (16:57 -0700)]

Merge "Avoid Data Usage AppDetailsFragment ISE."

commit | commitdiff | tree

Jeff Sharkey [Thu, 15 Mar 2012 23:40:31 +0000 (16:40 -0700)]

Avoid Data Usage AppDetailsFragment ISE.

Bug: 6022913
Change-Id: I4672b327096add4beeeb52f0bb467622b3467fcf

commit | commitdiff | tree

Eric Fischer [Thu, 15 Mar 2012 21:36:44 +0000 (14:36 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic216c073a9621e953fb5ef6ed36ffdd59ad39660

commit | commitdiff | tree

Eric Fischer [Wed, 14 Mar 2012 22:43:29 +0000 (15:43 -0700)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Eric Fischer [Wed, 14 Mar 2012 21:12:26 +0000 (14:12 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ibb5f856dcee5229da8d143a28a058729810ad83d

commit | commitdiff | tree

Jake Hamby [Wed, 14 Mar 2012 02:15:20 +0000 (19:15 -0700)]

Fix IME soft keyboard for Bluetooth rename device dialog.

The soft keyboard should automatically pop up when the user selects
the Bluetooth rename device menu item. Fixed by calling
setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE) on the Window
containing the AlertDialog before showing.

The device name field should also be a single line field, with the
Done button causing the device to be renamed. Set the "singleLine"
attribute in the layout XML to true, and added a
TextView.OnEditorActionListener to set the device name and dismiss
the dialog for EditorInfo.IME_ACTION_DONE.

Bug: 5342542
Bug: 5343354
Change-Id: I550d8e9a59395ad66f8a9c11d29c0f2ef278c196

commit | commitdiff | tree

Eric Fischer [Tue, 13 Mar 2012 22:14:08 +0000 (15:14 -0700)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Eric Fischer [Tue, 13 Mar 2012 22:09:56 +0000 (15:09 -0700)]

Import translations. DO NOT MERGE

Change-Id: If243350912de447caaf65ae0d3fe1e0d4d639fd4

commit | commitdiff | tree

Irfan Sheriff [Tue, 13 Mar 2012 21:28:39 +0000 (14:28 -0700)]

Merge "Enhance static IP UI"

commit | commitdiff | tree

Irfan Sheriff [Tue, 13 Mar 2012 18:14:54 +0000 (11:14 -0700)]

Enhance static IP UI

Based on the IP address provided, choose a default gateway, network prefix
and DNS to reduce typing for common scenarios

Bug: 6006249
Change-Id: I27878ce7895386b744013f267d29b3309208ec07

commit | commitdiff | tree

Eric Fischer [Mon, 12 Mar 2012 21:51:05 +0000 (14:51 -0700)]

Import translations. DO NOT MERGE

Change-Id: I3e41f60d64f58cd7b999359e7aea7461c9a40a32

commit | commitdiff | tree

Irfan Sheriff [Mon, 12 Mar 2012 17:38:19 +0000 (10:38 -0700)]

Merge "Increase char limit"

commit | commitdiff | tree

Irfan Sheriff [Mon, 12 Mar 2012 17:13:54 +0000 (10:13 -0700)]

Increase char limit

Bug: 6126418
Change-Id: I1addfec2dd8810028cd0e19c27eff5602358c6b9

commit | commitdiff | tree

Jeff Sharkey [Sat, 10 Mar 2012 02:33:51 +0000 (18:33 -0800)]

Merge "Save timezone when setting data cycle reset date."

commit | commitdiff | tree

Jeff Sharkey [Sat, 10 Mar 2012 01:11:14 +0000 (17:11 -0800)]

Save timezone when setting data cycle reset date.

Bug: 5938567
Change-Id: I9df8da9d030169952098efc04cfde79e3e42e1f8

commit | commitdiff | tree

Irfan Sheriff [Sat, 10 Mar 2012 00:27:59 +0000 (16:27 -0800)]

Merge "Fix p2p settings NPE"

commit | commitdiff | tree

Irfan Sheriff [Fri, 9 Mar 2012 22:25:37 +0000 (14:25 -0800)]

Fix p2p settings NPE

Bug: 6138959
Change-Id: I0c930686220ad8a77e3a998a108158b2467b5707

commit | commitdiff | tree

Eric Fischer [Fri, 9 Mar 2012 21:31:11 +0000 (13:31 -0800)]

Import translations. DO NOT MERGE

Change-Id: I3c88f810d7ef01a594865e8102048c0090dde1f5

commit | commitdiff | tree

Irfan Sheriff [Fri, 9 Mar 2012 09:17:50 +0000 (01:17 -0800)]

Merge "Use a different place holder name for string"

commit | commitdiff | tree

Eric Fischer [Fri, 9 Mar 2012 01:45:43 +0000 (17:45 -0800)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Irfan Sheriff [Fri, 9 Mar 2012 00:51:39 +0000 (16:51 -0800)]

Use a different place holder name for string

Bug: 6132597
Change-Id: Ie6bf125413da4c1bcd288ae329e6d0f07200db85

commit | commitdiff | tree

Eric Fischer [Thu, 8 Mar 2012 21:40:33 +0000 (13:40 -0800)]

Import translations. DO NOT MERGE

Change-Id: I8b363dd496956ef7205b7d22a7ff6a080398d0e3

commit | commitdiff | tree

Amith Yamasani [Thu, 8 Mar 2012 19:15:49 +0000 (11:15 -0800)]

Fix NPE due to removed preference.

Bug: 6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a

commit | commitdiff | tree

Eric Fischer [Wed, 7 Mar 2012 23:17:40 +0000 (15:17 -0800)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Eric Fischer [Wed, 7 Mar 2012 22:09:26 +0000 (14:09 -0800)]

Import translations. DO NOT MERGE

Change-Id: I0a6f821b47bcd8d1a67f6c7436eb79b5bd9b6798

commit | commitdiff | tree

Irfan Sheriff [Wed, 7 Mar 2012 19:22:06 +0000 (11:22 -0800)]

Merge "P2p UI fixes"

commit | commitdiff | tree

Irfan Sheriff [Wed, 7 Mar 2012 18:54:06 +0000 (10:54 -0800)]

P2p UI fixes

- Move Wi-Fi direct as a setting in Wi-Fi
- Handle some UI refresh issues

Change-Id: Idc43a2ca98acc4b904ca1f5fe0b1447ee612f218

commit | commitdiff | tree

Irfan Sheriff [Tue, 6 Mar 2012 20:37:49 +0000 (12:37 -0800)]

Merge "Remove dead strings and code"

commit | commitdiff | tree

Irfan Sheriff [Tue, 6 Mar 2012 20:27:44 +0000 (12:27 -0800)]

Remove dead strings and code

Change-Id: Iacd5c1bee978a52b2e534a2c9db5a1b98f5bd48e

commit | commitdiff | tree

Dianne Hackborn [Tue, 6 Mar 2012 18:33:41 +0000 (10:33 -0800)]

Merge "Use a component name that actually exists when enabling/disabling."

commit | commitdiff | tree

Dianne Hackborn [Tue, 6 Mar 2012 02:37:54 +0000 (18:37 -0800)]

Use a component name that actually exists when enabling/disabling.

Change-Id: Id6422a0039060bce3dc1bdc39551f04a4e4adbe6

commit | commitdiff | tree

Eric Fischer [Tue, 6 Mar 2012 00:09:48 +0000 (16:09 -0800)]

Also restore a deleted array that is still referenced.

Change-Id: I6b9aecd9dc634eb55c2d256ab9dc9f623ad4feb5

commit | commitdiff | tree

Eric Fischer [Mon, 5 Mar 2012 23:54:04 +0000 (15:54 -0800)]

Restore deleted strings still referenced from resources.

Change-Id: I29b16678900a1056ee6f41e530d68bb308ef27c9

commit | commitdiff | tree

Eric Fischer [Mon, 5 Mar 2012 23:17:09 +0000 (15:17 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ica141533e5f8c8791b55304152524e4c26fc673b

commit | commitdiff | tree

satok [Mon, 5 Mar 2012 07:06:07 +0000 (16:06 +0900)]

Fix spell checker settings layout

Change-Id: Ida36af8ae4e2ebd74a29d7b941bf718604de3b12

commit | commitdiff | tree

Irfan Sheriff [Sat, 3 Mar 2012 00:33:10 +0000 (16:33 -0800)]

Merge "Enhance and fix WPS UI"

commit | commitdiff | tree

Irfan Sheriff [Tue, 28 Feb 2012 00:20:29 +0000 (16:20 -0800)]

Enhance and fix WPS UI

- Fixes WPS usage for open network
- Exposes WPS on UI for easy access to push button and pin based techniques
- Adds support for cancelling WPS
- Adds a dialog that reports a progress since WPS can take quite a bit of time
to complete

The WpsDialog code is enhanced from contribution by yoshihiko.ikenaga@jp.sony.com
on partner source.

Change-Id: Ib0103507e0192e8195e7bfeb1c8e8855c20e23ca

commit | commitdiff | tree

Eric Fischer [Fri, 2 Mar 2012 22:15:42 +0000 (14:15 -0800)]

Import translations. DO NOT MERGE

Change-Id: I784ea3784067393b951c50a50938b9140a36f236

commit | commitdiff | tree

Irfan Sheriff [Fri, 2 Mar 2012 07:57:12 +0000 (23:57 -0800)]

am f91e52c9: am c4bf8cd9: am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."

* commit 'f91e52c986f4e7f8094a794c471813ac05d5d59c':
Enable EAP-pwd configuration in WiFi Settings.

commit | commitdiff | tree

Irfan Sheriff [Fri, 2 Mar 2012 06:55:17 +0000 (22:55 -0800)]

am c4bf8cd9: am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."

* commit 'c4bf8cd955e7a317c6d9c0eb023d5994be0f1e9d':
Enable EAP-pwd configuration in WiFi Settings.

commit | commitdiff | tree

Irfan Sheriff [Fri, 2 Mar 2012 06:48:42 +0000 (22:48 -0800)]

am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."

* commit '2f76aaaf0105add942334ef3574e7378ee8a6097':
Enable EAP-pwd configuration in WiFi Settings.

commit | commitdiff | tree

Irfan Sheriff [Fri, 2 Mar 2012 00:47:19 +0000 (16:47 -0800)]

Merge "Enable EAP-pwd configuration in WiFi Settings."

commit | commitdiff | tree

The Android Open Source Project [Fri, 2 Mar 2012 00:46:23 +0000 (16:46 -0800)]

am 9ae0b5a2: am b2a0ea35: Reconcile with ics-mr1-release

* commit '9ae0b5a23d8bc010589e77d29926b55903f3a31e':

commit | commitdiff | tree

Irfan Sheriff [Fri, 2 Mar 2012 00:26:58 +0000 (16:26 -0800)]

Merge "Use new WifiManager API"

commit | commitdiff | tree

The Android Open Source Project [Thu, 1 Mar 2012 23:51:22 +0000 (15:51 -0800)]

am 224fee2e: am 79ec613a: Reconcile with ics-mr1-release

* commit '224fee2e581afd70a63b29e6a0bdcb0f10a15b33':