OSDN Git Service
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
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
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
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
Eric Fischer [Wed, 9 Nov 2011 23:15:42 +0000 (15:15 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
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
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
Robert Ly [Wed, 9 Nov 2011 21:23:34 +0000 (13:23 -0800)]
Merge "docs: update samples toc for rs sample" into ics-mr0
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
Jamie Gennis [Wed, 9 Nov 2011 19:46:45 +0000 (11:46 -0800)]
Merge "EGL: add deferred saving of the cache" into ics-mr1
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
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
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
Peter Ng [Wed, 9 Nov 2011 18:57:23 +0000 (10:57 -0800)]
Merge "Making quicksettings opaque again" into ics-mr1
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
John Reck [Wed, 9 Nov 2011 17:28:11 +0000 (09:28 -0800)]
Merge "Fix determining find on page overlap" into ics-mr1
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':
The Android Open Source Project [Wed, 9 Nov 2011 17:00:40 +0000 (09:00 -0800)]
Reconcile with ics-mr0-release
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
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
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
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()
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':
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':
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()
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
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.
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
Eric Laurent [Wed, 9 Nov 2011 16:27:18 +0000 (08:27 -0800)]
Merge "Fix regression for SoundPool playback" into ics-mr1
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':
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
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
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.
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.
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.
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.
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.
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.
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.
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.
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.
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
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
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.
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
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
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
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
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
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
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.
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.
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.
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
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.
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':
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
Glenn Kasten [Wed, 9 Nov 2011 14:35:18 +0000 (14:35 +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
The Android Automerger [Wed, 9 Nov 2011 14:28:43 +0000 (06:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Gilles Debunne [Wed, 9 Nov 2011 08:26:46 +0000 (00:26 -0800)]
Merge "Bug
5575396: close spell session on language change" into ics-mr1
Jeff Sharkey [Wed, 9 Nov 2011 07:43:58 +0000 (23:43 -0800)]
Merge "Bootstrap stats before registering listeners." into ics-mr1
Jeff Sharkey [Wed, 9 Nov 2011 07:43:38 +0000 (23:43 -0800)]
Merge "Make operation counts monotonically increase." into ics-mr1
Jeff Sharkey [Wed, 9 Nov 2011 07:43:23 +0000 (23:43 -0800)]
Merge "Dispatch alerts through background thread." into ics-mr1
Jeff Sharkey [Wed, 9 Nov 2011 07:43:12 +0000 (23:43 -0800)]
Merge "Make policy data enabled flag static." into ics-mr1
Daniel Sandler [Wed, 9 Nov 2011 04:35:45 +0000 (20:35 -0800)]
Merge "Add day of week." into ics-mr1
David Brown [Wed, 9 Nov 2011 02:25:30 +0000 (18:25 -0800)]
Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
Mathias Agopian [Wed, 9 Nov 2011 02:01:21 +0000 (18:01 -0800)]
Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 01:59:36 +0000 (17:59 -0800)]
EGL: add deferred saving of the cache
This change causes any insertions into the EGL cache to trigger an
attempt to save the cache contents to disk. The save operation is
deferred to allow multiple cache insertions to be batched up.
Change-Id: I6cfec9c0dbbef94d3f8880860e2a365dccc296c7
Dianne Hackborn [Wed, 9 Nov 2011 01:58:26 +0000 (17:58 -0800)]
Merge "Don't crash if there is no connectivity service." into ics-mr1
Svetoslav Ganov [Wed, 9 Nov 2011 01:33:49 +0000 (17:33 -0800)]
Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
Glenn Kasten [Wed, 9 Nov 2011 01:31:32 +0000 (17:31 -0800)]
Merge "Bug
5478024 drop after decode if can't drop before" into ics-mr0
Jeff Sharkey [Wed, 9 Nov 2011 01:27:03 +0000 (17:27 -0800)]
Merge "Avoid inconsistent state when remove fails." into ics-mr1
Jeff Brown [Wed, 9 Nov 2011 01:22:06 +0000 (17:22 -0800)]
Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug:
5569662" into ics-mr1
Mathias Agopian [Wed, 9 Nov 2011 01:20:59 +0000 (17:20 -0800)]
Merge "SensorService now always clamps the requested rate" into ics-mr1
Dianne Hackborn [Wed, 9 Nov 2011 01:01:05 +0000 (17:01 -0800)]
Merge "Add drop box reports of low memory." into ics-mr1
Michael Kolb [Wed, 9 Nov 2011 00:34:53 +0000 (16:34 -0800)]
Merge "Remove flicker from WebTextView" into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 00:15:26 +0000 (16:15 -0800)]
Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 00:14:44 +0000 (16:14 -0800)]
Merge changes I18e5e789,I5cbaae2d into ics-mr1
* changes:
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
Mathias Agopian [Tue, 8 Nov 2011 23:55:55 +0000 (15:55 -0800)]
Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
Jamie Gennis [Tue, 8 Nov 2011 01:03:54 +0000 (17:03 -0800)]
EGL: implement loading and saving the cache
This change adds support for saving and loading the contents of the EGL
cache. It also adds some simple tests for the EGL cache.
Change-Id: I18e5e789e0897a0783d29d1c1e64d26de2dd44c4
Irfan Sheriff [Tue, 8 Nov 2011 23:51:43 +0000 (15:51 -0800)]
Merge "Convert soft ap config store to state machine" into ics-mr1
Dave Santoro [Tue, 8 Nov 2011 22:48:21 +0000 (14:48 -0800)]
Merge "Unhide social stream APIs for Contacts." into ics-mr1
Adam Powell [Tue, 8 Nov 2011 22:32:29 +0000 (14:32 -0800)]
Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
Jake Hamby [Tue, 8 Nov 2011 22:02:49 +0000 (22:02 +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.
Brian Colonna [Tue, 8 Nov 2011 22:02:48 +0000 (22:02 +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
Jake Hamby [Tue, 8 Nov 2011 21:22:34 +0000 (13:22 -0800)]
Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
Wei Huang [Tue, 8 Nov 2011 21:16:02 +0000 (13:16 -0800)]
Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
Brian Colonna [Tue, 8 Nov 2011 20:51:36 +0000 (12:51 -0800)]
Merge "Fix
5514230: preventing null window token from occurring" into ics-mr0
Matthew Xie [Tue, 8 Nov 2011 20:19:37 +0000 (12:19 -0800)]
Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
Dianne Hackborn [Tue, 8 Nov 2011 19:52:58 +0000 (11:52 -0800)]
Merge "Cleanup remote execution of perf tests." into ics-mr1
The Android Open Source Project [Tue, 8 Nov 2011 19:08:20 +0000 (11:08 -0800)]
Reconcile with ics-mr0-release
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
Adam Cohen [Tue, 8 Nov 2011 18:53:39 +0000 (10:53 -0800)]
Merge "Making default widget padding public API" into ics-mr1
Robert Greenwalt [Tue, 8 Nov 2011 18:31:37 +0000 (10:31 -0800)]
Merge "Fix build." into ics-mr1
Adam Powell [Tue, 8 Nov 2011 18:06:00 +0000 (10:06 -0800)]
Merge "Fix bug
5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1
Danielle Millett [Tue, 8 Nov 2011 18:03:24 +0000 (10:03 -0800)]
Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
Robert Greenwalt [Tue, 8 Nov 2011 18:01:07 +0000 (10:01 -0800)]
Merge "Wimax : wimax framework related open source." into ics-mr1
Tom Taylor [Tue, 8 Nov 2011 17:00:22 +0000 (09:00 -0800)]
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
Andreas Huber [Tue, 8 Nov 2011 16:48:31 +0000 (08:48 -0800)]
Merge "Remove surface legacy APIs and code." into ics-mr1
John Reck [Tue, 8 Nov 2011 16:38:07 +0000 (08:38 -0800)]
Merge "Remove unnecessary memory allocations" into ics-mr1
Eric Laurent [Tue, 8 Nov 2011 16:32:57 +0000 (08:32 -0800)]
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
The Android Automerger [Tue, 8 Nov 2011 14:41:10 +0000 (06:41 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
OSDN Git Service
