git.osdn.net Git - android-x86/frameworks-native.git/log

Kenny Root [Thu, 10 Nov 2011 21:20:28 +0000 (21:20 +0000)]

am bc853c03: Merge "Close file on exception as well" into ics-mr1

* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
Close file on exception as well

commit | commitdiff | tree

Kenny Root [Thu, 10 Nov 2011 21:18:24 +0000 (13:18 -0800)]

Merge "Close file on exception as well" into ics-mr1

commit | commitdiff | tree

Tom Taylor [Thu, 10 Nov 2011 21:13:42 +0000 (21:13 +0000)]

am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1

* commit 'faa81c82103e89a3f2c86c4e737d9beb7e557402':
Revert "Add new secure setting for controlling Messaging notifications"

commit | commitdiff | tree

Tom Taylor [Thu, 10 Nov 2011 21:11:16 +0000 (13:11 -0800)]

Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 10 Nov 2011 20:08:29 +0000 (20:08 +0000)]

am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1

* commit 'c1c5d4faa22a7d22b8225b2bbf83206698b83763':
Add a sound-playing method to Camera API.

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 10 Nov 2011 20:07:05 +0000 (12:07 -0800)]

Merge "Add a sound-playing method to Camera API." into ics-mr1

commit | commitdiff | tree

Mathias Agopian [Thu, 10 Nov 2011 18:35:48 +0000 (18:35 +0000)]

am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1

* commit '785fd3685a69e5b3ef9c0958dcf4ae85f818e78d':
handle EINTR when calling sensor HAL's poll function

commit | commitdiff | tree

Mathias Agopian [Thu, 10 Nov 2011 18:33:55 +0000 (10:33 -0800)]

Merge "handle EINTR when calling sensor HAL's poll function" into ics-mr1

commit | commitdiff | tree

John Reck [Thu, 10 Nov 2011 17:21:43 +0000 (17:21 +0000)]

am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1

* commit '843e04d977fd348ed474da1d3c6a62e7dc837444':
Pause drawing when not visible

commit | commitdiff | tree

John Reck [Thu, 10 Nov 2011 17:19:55 +0000 (09:19 -0800)]

Merge "Pause drawing when not visible" into ics-mr1

commit | commitdiff | tree

Andreas Huber [Thu, 10 Nov 2011 16:51:59 +0000 (16:51 +0000)]

am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1

* commit '2375d16378e6f8b7694c5a2cd9e0622e382e6049':
Send RTSP control connection keep-alive requests

commit | commitdiff | tree

Andreas Huber [Thu, 10 Nov 2011 16:51:58 +0000 (16:51 +0000)]

am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1

* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
Don't believe the PV decoder's lies...

commit | commitdiff | tree

Andreas Huber [Thu, 10 Nov 2011 16:48:53 +0000 (16:48 +0000)]

am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1

* commit '7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
There's no point in trying to continue to decode after an error was signalled.

commit | commitdiff | tree

Andreas Huber [Thu, 10 Nov 2011 16:48:44 +0000 (08:48 -0800)]

Merge "Send RTSP control connection keep-alive requests" into ics-mr1

commit | commitdiff | tree

Andreas Huber [Thu, 10 Nov 2011 16:48:34 +0000 (08:48 -0800)]

Merge "Don't believe the PV decoder's lies..." into ics-mr1

commit | commitdiff | tree

Andreas Huber [Thu, 10 Nov 2011 16:47:25 +0000 (08:47 -0800)]

Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1

commit | commitdiff | tree

George Mount [Thu, 10 Nov 2011 16:34:16 +0000 (16:34 +0000)]

am c60baec7: Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1

* commit 'c60baec7a737d3c3cd596c5c4378a6e12450da3d':
DO NOT MERGE Set the initial scroll position for RTL.

commit | commitdiff | tree

George Mount [Thu, 10 Nov 2011 16:32:18 +0000 (08:32 -0800)]

Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1

commit | commitdiff | tree

Eric Laurent [Thu, 10 Nov 2011 16:30:22 +0000 (16:30 +0000)]

am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1

* commit '7c61fa70a50e15466f807dd194e530bc4fd3a96a':
Fix problems in tablet silent mode.

commit | commitdiff | tree

Eric Laurent [Thu, 10 Nov 2011 16:28:58 +0000 (08:28 -0800)]

Merge "Fix problems in tablet silent mode." into ics-mr1

commit | commitdiff | tree

Wink Saville [Thu, 10 Nov 2011 15:25:03 +0000 (15:25 +0000)]

am a092ba56: am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0

* commit 'a092ba5667e9c055f4d5c83296c8c81471695747':
[maguro] Update COMPREHENSION-TLV parser in CAT

commit | commitdiff | tree

Wink Saville [Thu, 10 Nov 2011 15:22:35 +0000 (15:22 +0000)]

am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0

* commit 'e562287c85662457864255028cd4bc3b04f13750':
[maguro] Update COMPREHENSION-TLV parser in CAT

commit | commitdiff | tree

Wink Saville [Thu, 10 Nov 2011 15:20:55 +0000 (07:20 -0800)]

Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0

commit | commitdiff | tree

Gilles Debunne [Thu, 10 Nov 2011 08:49:51 +0000 (08:49 +0000)]

am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1

* commit 'e5504ba1a279fc58eac74bda8d9c5c29cae235a9':
Visual glitches when starting extracted text

commit | commitdiff | tree

Gilles Debunne [Thu, 10 Nov 2011 08:48:10 +0000 (00:48 -0800)]

Merge "Visual glitches when starting extracted text" into ics-mr1

commit | commitdiff | tree

Dave Burke [Thu, 10 Nov 2011 08:01:47 +0000 (08:01 +0000)]

am b5dbf66c: am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0

* commit 'b5dbf66c7538838eda29b75309234f20720170d1':
Actually 59 fps DO NOT MERGE

commit | commitdiff | tree

Dave Burke [Thu, 10 Nov 2011 07:59:32 +0000 (07:59 +0000)]

am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0

* commit 'b96194308dc8678e99564f038872061e4881e65a':
Actually 59 fps DO NOT MERGE

commit | commitdiff | tree

Dave Burke [Thu, 10 Nov 2011 07:58:09 +0000 (23:58 -0800)]

Merge "Actually 59 fps DO NOT MERGE" into ics-mr0

commit | commitdiff | tree

Dave Burke [Thu, 10 Nov 2011 07:50:45 +0000 (23:50 -0800)]

Actually 59 fps DO NOT MERGE

Change-Id: Ic70dbba81c054eaaf21f71b10e329ebf1424d4a2

commit | commitdiff | tree

Dave Burke [Thu, 10 Nov 2011 07:50:19 +0000 (07:50 +0000)]

am ab22f862: Merge "Back to 59fps" into ics-mr1

* commit 'ab22f862a912035ba83591db448806fd81ed74f4':
Back to 59fps

commit | commitdiff | tree

Dave Burke [Thu, 10 Nov 2011 07:49:09 +0000 (23:49 -0800)]

Merge "Back to 59fps" into ics-mr1

commit | commitdiff | tree

satok [Thu, 10 Nov 2011 05:28:47 +0000 (05:28 +0000)]

am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1

* commit '114c4d3843758a2a1ffb32eb2719d65cdee637f8':
Introduce an API to cancel pending/running spell check tasks

commit | commitdiff | tree

satok [Thu, 10 Nov 2011 05:26:46 +0000 (21:26 -0800)]

Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1

commit | commitdiff | tree

Daniel Sandler [Thu, 10 Nov 2011 04:42:15 +0000 (04:42 +0000)]

am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1

* commit 'bca520a170f84c8be840e629841d0dc7d7cb273b':
Use platform assets for brightness scrubber.

commit | commitdiff | tree

Daniel Sandler [Thu, 10 Nov 2011 04:41:03 +0000 (20:41 -0800)]

Merge "Use platform assets for brightness scrubber." into ics-mr1

commit | commitdiff | tree

Wink Saville [Thu, 10 Nov 2011 03:44:27 +0000 (03:44 +0000)]

am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0

* commit '08b3ffe61182b60ded3bfa599778b6f5495e87db':
Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.

commit | commitdiff | tree

Wink Saville [Thu, 10 Nov 2011 03:42:09 +0000 (03:42 +0000)]

am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0

* commit '16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.

commit | commitdiff | tree

Wink Saville [Thu, 10 Nov 2011 03:39:39 +0000 (19:39 -0800)]

Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0

commit | commitdiff | tree

satok [Thu, 10 Nov 2011 02:44:24 +0000 (02:44 +0000)]

am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1

* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
Respect user settings for spell checking language if explicitly set

commit | commitdiff | tree

satok [Thu, 10 Nov 2011 02:42:48 +0000 (18:42 -0800)]

Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1

commit | commitdiff | tree

Dave Burke [Thu, 10 Nov 2011 00:39:21 +0000 (16:39 -0800)]

Back to 59fps

Change-Id: I8d89e5e27f1abc5a2e36cb832eb4db2ca83c2cc6

commit | commitdiff | tree

Mathias Agopian [Thu, 10 Nov 2011 00:44:27 +0000 (00:44 +0000)]

am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE

* commit '42694dc4a7af4f38e39cb26a852f3f75e730bb05':
Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE

commit | commitdiff | tree

Mathias Agopian [Thu, 10 Nov 2011 00:41:43 +0000 (00:41 +0000)]

am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE

* commit '3e458306b0caf4e21294acc58286b24bda08a242':
Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE

commit | commitdiff | tree

Mathias Agopian [Sat, 5 Nov 2011 01:46:11 +0000 (18:46 -0700)]

Set the WM refresh rate to 60 Hz for tuna devices only DO
NOT MERGE

This approach is TEMPORARY until we can do this properly.

Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f

commit | commitdiff | tree

Jim Miller [Wed, 9 Nov 2011 23:21:39 +0000 (23:21 +0000)]

am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1

* commit '270826a8878b5470d48d93ca3d518ac93860870d':
Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen

commit | commitdiff | tree

Eric Fischer [Wed, 9 Nov 2011 23:21:38 +0000 (23:21 +0000)]

am 6b992090: am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0

* commit '6b992090f6eb1e14553be22373799258bb401e3d':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Jim Miller [Wed, 9 Nov 2011 23:19:31 +0000 (15:19 -0800)]

Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1

commit | commitdiff | tree

Eric Fischer [Wed, 9 Nov 2011 23:18:10 +0000 (23:18 +0000)]

am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0

* commit '3124bf64404dbb90cc521abf4c7bf8d438346362':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 9 Nov 2011 23:15:42 +0000 (15:15 -0800)]

Merge "Import revised translations. DO NOT MERGE" into ics-mr0

commit | commitdiff | tree

Robert Ly [Wed, 9 Nov 2011 21:28:23 +0000 (21:28 +0000)]

am 69db5695: am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0

* commit '69db56958fdac41a093cd6cf00cbe200f2885730':
docs: update samples toc for rs sample

commit | commitdiff | tree

Robert Ly [Wed, 9 Nov 2011 21:25:45 +0000 (21:25 +0000)]

am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0

* commit 'bd4bdbec62776b1222b1f202e44f8f127bfb7bab':
docs: update samples toc for rs sample

commit | commitdiff | tree

Robert Ly [Wed, 9 Nov 2011 21:23:34 +0000 (13:23 -0800)]

Merge "docs: update samples toc for rs sample" into ics-mr0

commit | commitdiff | tree

Jamie Gennis [Wed, 9 Nov 2011 19:48:29 +0000 (19:48 +0000)]

am 97ece7a9: Merge "EGL: add deferred saving of the cache" into ics-mr1

* commit '97ece7a95f76ec724633d4f4764291ea4dc20933':
EGL: add deferred saving of the cache

commit | commitdiff | tree

Jamie Gennis [Wed, 9 Nov 2011 19:46:45 +0000 (11:46 -0800)]

Merge "EGL: add deferred saving of the cache" into ics-mr1

commit | commitdiff | tree

Jeff Brown [Wed, 9 Nov 2011 19:21:50 +0000 (19:21 +0000)]

am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1

* commit 'e7de36e605e0ccf4552c8ee1db40cb9af3227cf4':
Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022

commit | commitdiff | tree

Jeff Brown [Wed, 9 Nov 2011 19:20:24 +0000 (11:20 -0800)]

Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1

commit | commitdiff | tree

Peter Ng [Wed, 9 Nov 2011 18:59:18 +0000 (18:59 +0000)]

am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1

* commit '34dd937be1a325fd92d6479822960e4ca13f2420':
Making quicksettings opaque again

commit | commitdiff | tree

Peter Ng [Wed, 9 Nov 2011 18:57:23 +0000 (10:57 -0800)]

Merge "Making quicksettings opaque again" into ics-mr1

commit | commitdiff | tree

John Reck [Wed, 9 Nov 2011 17:30:39 +0000 (17:30 +0000)]

am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1

* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
Fix determining find on page overlap

commit | commitdiff | tree

John Reck [Wed, 9 Nov 2011 17:28:11 +0000 (09:28 -0800)]

Merge "Fix determining find on page overlap" into ics-mr1

commit | commitdiff | tree

The Android Open Source Project [Wed, 9 Nov 2011 17:03:59 +0000 (17:03 +0000)]

am eae6c997: Reconcile with ics-mr0-release

* commit 'eae6c9972d91b9af58c3bf7ba0235c0a3e95c408':

commit | commitdiff | tree

The Android Open Source Project [Wed, 9 Nov 2011 17:00:40 +0000 (09:00 -0800)]

Reconcile with ics-mr0-release

Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 9 Nov 2011 16:59:48 +0000 (16:59 +0000)]

am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1

* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
Bug 5585323 New system permission for media decode

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 9 Nov 2011 16:57:43 +0000 (08:57 -0800)]

Merge "Bug 5585323 New system permission for media decode" into ics-mr1

commit | commitdiff | tree

David Brown [Wed, 9 Nov 2011 16:44:53 +0000 (16:44 +0000)]

am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0

* commit 'b6b44cef94a38b6f403b43f55d77d3602de18a3c':
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()

commit | commitdiff | tree

Glenn Kasten [Wed, 9 Nov 2011 16:44:51 +0000 (16:44 +0000)]

am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

* commit 'f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':

commit | commitdiff | tree

Jake Hamby [Wed, 9 Nov 2011 16:44:49 +0000 (16:44 +0000)]

am 9c5c97f6: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0

* commit '9c5c97f61818f4d20079616a98d62f888f07d285':

commit | commitdiff | tree

David Brown [Wed, 9 Nov 2011 16:41:20 +0000 (16:41 +0000)]

am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0

* commit '59882fb8e0ba7c47b780d62c9a9c46b63d779677':
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()

commit | commitdiff | tree

Glenn Kasten [Wed, 9 Nov 2011 16:41:19 +0000 (16:41 +0000)]

am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0

* commit '19998120f53caceb620f138c6eea182f1e693660':
Bug 5478024 drop after decode if can't drop before

commit | commitdiff | tree

Jake Hamby [Wed, 9 Nov 2011 16:40:59 +0000 (16:40 +0000)]

am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0

* commit 'fee5f29b22f99bd2891fb2af54669f20832fb851':
Fix exception when sending multi-page SMS with Turkish characters.

commit | commitdiff | tree

Eric Laurent [Wed, 9 Nov 2011 16:29:04 +0000 (16:29 +0000)]

am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1

* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
Fix regression for SoundPool playback

commit | commitdiff | tree

Eric Laurent [Wed, 9 Nov 2011 16:27:18 +0000 (08:27 -0800)]

Merge "Fix regression for SoundPool playback" into ics-mr1

commit | commitdiff | tree

Brian Colonna [Wed, 9 Nov 2011 15:38:45 +0000 (15:38 +0000)]

am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0

* commit '09a56563cea260f12b5606837f5b01420b920170':

commit | commitdiff | tree

Brian Colonna [Wed, 9 Nov 2011 15:35:12 +0000 (15:35 +0000)]

am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0

* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
Fix 5514230: preventing null window token from occurring

commit | commitdiff | tree

Gilles Debunne [Wed, 9 Nov 2011 14:36:59 +0000 (14:36 +0000)]

am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1

* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
Bug 5575396: close spell session on language change

commit | commitdiff | tree

Jeff Sharkey [Wed, 9 Nov 2011 14:36:57 +0000 (14:36 +0000)]

am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1

* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
Bootstrap stats before registering listeners.

commit | commitdiff | tree

Jeff Sharkey [Wed, 9 Nov 2011 14:36:56 +0000 (14:36 +0000)]

am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1

* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
Make operation counts monotonically increase.

commit | commitdiff | tree

Jeff Sharkey [Wed, 9 Nov 2011 14:36:54 +0000 (14:36 +0000)]

am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1

* commit '2048789c64d30b0d3c42c4df7e705f14b7295e10':
Dispatch alerts through background thread.

commit | commitdiff | tree

Jeff Sharkey [Wed, 9 Nov 2011 14:36:53 +0000 (14:36 +0000)]

am f3882914: Merge "Make policy data enabled flag static." into ics-mr1

* commit 'f3882914e668501ee1dabd42207ed18348050c14':
Make policy data enabled flag static.

commit | commitdiff | tree

Daniel Sandler [Wed, 9 Nov 2011 14:36:52 +0000 (14:36 +0000)]

am da738d63: Merge "Add day of week." into ics-mr1

* commit 'da738d638cc2fee29d5936f21c6eadbcf173a718':
Add day of week.

commit | commitdiff | tree

Mathias Agopian [Wed, 9 Nov 2011 14:36:46 +0000 (14:36 +0000)]

am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1

* commit 'e4a1bafba351a1b4cea18af3442412de03dd4d89':
decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.

commit | commitdiff | tree

Dianne Hackborn [Wed, 9 Nov 2011 14:36:44 +0000 (14:36 +0000)]

am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1

* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
Don't crash if there is no connectivity service.

commit | commitdiff | tree

Svetoslav Ganov [Wed, 9 Nov 2011 14:36:39 +0000 (14:36 +0000)]

am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1

* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
NumberPicker incorectly enforcing minimal width and height.

commit | commitdiff | tree

Jeff Sharkey [Wed, 9 Nov 2011 14:36:36 +0000 (14:36 +0000)]

am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1

* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
Avoid inconsistent state when remove fails.

commit | commitdiff | tree

Jeff Brown [Wed, 9 Nov 2011 14:36:34 +0000 (14:36 +0000)]

am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1

* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471':
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662

commit | commitdiff | tree

Mathias Agopian [Wed, 9 Nov 2011 14:36:31 +0000 (14:36 +0000)]

am 393e2c1f: Merge "SensorService now always clamps the requested rate" into ics-mr1

* commit '393e2c1f7aad37e7851643df22e4810996c26d1f':
SensorService now always clamps the requested rate

commit | commitdiff | tree

Dianne Hackborn [Wed, 9 Nov 2011 14:36:29 +0000 (14:36 +0000)]

am 3af8b88d: Merge "Add drop box reports of low memory." into ics-mr1

* commit '3af8b88d032011fdbc6c498cf3f3881281cff999':
Add drop box reports of low memory.

commit | commitdiff | tree

Michael Kolb [Wed, 9 Nov 2011 14:36:22 +0000 (14:36 +0000)]

am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1

* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
Remove flicker from WebTextView

commit | commitdiff | tree

Jamie Gennis [Wed, 9 Nov 2011 14:36:15 +0000 (14:36 +0000)]

am d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1

* commit 'd211b4882a662409b85a1f90c71e28faa9c54464':
SurfaceTexture: unhide setDefaultBufferSize

commit | commitdiff | tree

Jamie Gennis [Wed, 9 Nov 2011 14:36:14 +0000 (14:36 +0000)]

am 911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1

* commit '911263dc5df48b89e8f9010fb74dfe2649bdc442':
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache

commit | commitdiff | tree

Mathias Agopian [Wed, 9 Nov 2011 14:36:11 +0000 (14:36 +0000)]

am 95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1

* commit '95482b61c348fc54bf44a96a8b73011c90b40520':
Fix an issue where we could wait for a non-existing transaction

commit | commitdiff | tree

Irfan Sheriff [Wed, 9 Nov 2011 14:36:09 +0000 (14:36 +0000)]

am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1

* commit '59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
Convert soft ap config store to state machine

commit | commitdiff | tree

JP Abgrall [Wed, 9 Nov 2011 14:36:09 +0000 (14:36 +0000)]

Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp

commit | commitdiff | tree

Dave Santoro [Wed, 9 Nov 2011 14:36:00 +0000 (14:36 +0000)]

am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1

* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
Unhide social stream APIs for Contacts.

commit | commitdiff | tree

Adam Powell [Wed, 9 Nov 2011 14:35:59 +0000 (14:35 +0000)]

am 650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1

* commit '650a3e8894c6d26b258d26bdec856fde7aba43d6':
Fix the action bar menu layout to use the correct divider drawable.

commit | commitdiff | tree

Wei Huang [Wed, 9 Nov 2011 14:35:56 +0000 (14:35 +0000)]

am ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1

* commit 'ea50748b546e7dc21dc06195af5f0a8f2b812417':
Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.

commit | commitdiff | tree

Matthew Xie [Wed, 9 Nov 2011 14:35:53 +0000 (14:35 +0000)]

am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1

* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp

commit | commitdiff | tree

Dianne Hackborn [Wed, 9 Nov 2011 14:35:51 +0000 (14:35 +0000)]

am 665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1

* commit '665e105f145fcb27a54d53c6c9382bebf50a56d7':
Cleanup remote execution of perf tests.

commit | commitdiff | tree

The Android Open Source Project [Wed, 9 Nov 2011 14:35:48 +0000 (14:35 +0000)]

am 6dee1a9d: Reconcile with ics-mr0-release

* commit '6dee1a9d046458134fb019669b5ffe7911dcdb29':

commit | commitdiff | tree

Adam Cohen [Wed, 9 Nov 2011 14:35:45 +0000 (14:35 +0000)]

am 75b20380: Merge "Making default widget padding public API" into ics-mr1

* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
Making default widget padding public API