John Reck
d714c83962
Merge "Fix determining find on page overlap" into ics-mr1
2011-11-09 09:28:11 -08:00
The Android Open Source Project
bea63fd645
Reconcile with ics-mr0-release
...
Change-Id: I20113f16c260f8f796a0d370ea105ee17bdaea63
2011-11-09 09:00:40 -08:00
Jean-Michel Trivi
bd33207d68
Merge "Bug 5585323 New system permission for media decode" into ics-mr1
2011-11-09 08:57:43 -08:00
David Brown
394d2b68d0
am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
...
* commit '59882fb8e0ba7c47b780d62c9a9c46b63d779677':
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
2011-11-09 16:41:20 +00:00
Glenn Kasten
70f3211abb
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
2011-11-09 16:41:19 +00:00
Jake Hamby
f1896025db
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.
2011-11-09 16:40:59 +00:00
Eric Laurent
b2e9b55ecb
Merge "Fix regression for SoundPool playback" into ics-mr1
2011-11-09 08:27:20 -08:00
Brian Colonna
170e4c4ea7
am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
...
* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
Fix 5514230: preventing null window token from occurring
2011-11-09 15:35:12 +00:00
The Android Automerger
d8be24e84b
merge in ics-mr0-release history after reset to ics-mr0
2011-11-09 06:28:43 -08:00
Gilles Debunne
005c75cc49
Merge "Bug 5575396: close spell session on language change" into ics-mr1
2011-11-09 00:26:46 -08:00
Jeff Sharkey
57a70921a2
Merge "Bootstrap stats before registering listeners." into ics-mr1
2011-11-08 23:43:58 -08:00
Jeff Sharkey
e3ee3fc76c
Merge "Make operation counts monotonically increase." into ics-mr1
2011-11-08 23:43:38 -08:00
Jeff Sharkey
434f9e6c74
Merge "Dispatch alerts through background thread." into ics-mr1
2011-11-08 23:43:23 -08:00
Jeff Sharkey
a04ca4724f
Merge "Make policy data enabled flag static." into ics-mr1
2011-11-08 23:43:12 -08:00
Daniel Sandler
1f272dc236
Merge "Add day of week." into ics-mr1
2011-11-08 20:35:45 -08:00
David Brown
561d427958
Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
2011-11-08 18:25:30 -08:00
Mathias Agopian
ad04253386
Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1
2011-11-08 18:01:21 -08:00
Dianne Hackborn
6cd3075925
Merge "Don't crash if there is no connectivity service." into ics-mr1
2011-11-08 17:58:26 -08:00
Svetoslav Ganov
37adec8a7e
Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
2011-11-08 17:33:49 -08:00
Glenn Kasten
842caaa0af
Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0
2011-11-08 17:31:32 -08:00
Jeff Sharkey
0679ce0ae8
Merge "Avoid inconsistent state when remove fails." into ics-mr1
2011-11-08 17:27:03 -08:00
Jeff Brown
d2ab7ea0c5
Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
2011-11-08 17:22:06 -08:00
Mathias Agopian
d44935fcde
Merge "SensorService now always clamps the requested rate" into ics-mr1
2011-11-08 17:20:59 -08:00
Dianne Hackborn
6804efbfc2
Merge "Add drop box reports of low memory." into ics-mr1
2011-11-08 17:01:05 -08:00
Michael Kolb
47a6101d77
Merge "Remove flicker from WebTextView" into ics-mr1
2011-11-08 16:34:53 -08:00
Jamie Gennis
07289f166a
Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
2011-11-08 16:15:26 -08:00
Jamie Gennis
63a49a63f7
Merge changes I18e5e789,I5cbaae2d into ics-mr1
...
* changes:
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
2011-11-08 16:14:44 -08:00
Mathias Agopian
0fe35d093b
Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
2011-11-08 15:55:55 -08:00
Jamie Gennis
98c6383580
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
2011-11-08 15:54:36 -08:00
Irfan Sheriff
5036774acd
Merge "Convert soft ap config store to state machine" into ics-mr1
2011-11-08 15:51:43 -08:00
Dave Santoro
021ae663a5
Merge "Unhide social stream APIs for Contacts." into ics-mr1
2011-11-08 14:48:21 -08:00
Adam Powell
32dbf75850
Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
2011-11-08 14:32:29 -08:00
Jake Hamby
9db7f39431
Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
2011-11-08 13:22:34 -08:00
Wei Huang
666a5e7e84
Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
2011-11-08 13:16:02 -08:00
Brian Colonna
211e1d4227
Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
2011-11-08 12:51:36 -08:00
Matthew Xie
371ca8ca49
Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
2011-11-08 12:19:37 -08:00
Dianne Hackborn
4b91a35a6f
Merge "Cleanup remote execution of perf tests." into ics-mr1
2011-11-08 11:52:58 -08:00
The Android Open Source Project
d9a661544e
Reconcile with ics-mr0-release
...
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
2011-11-08 11:08:20 -08:00
Adam Cohen
a63aa04653
Merge "Making default widget padding public API" into ics-mr1
2011-11-08 10:53:39 -08:00
Robert Greenwalt
0950014537
Merge "Fix build." into ics-mr1
2011-11-08 10:31:37 -08:00
Adam Powell
ccb01309ea
Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1
2011-11-08 10:06:00 -08:00
Danielle Millett
acc37017ee
Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
2011-11-08 10:03:24 -08:00
Robert Greenwalt
12c1aaafd5
Merge "Wimax : wimax framework related open source." into ics-mr1
2011-11-08 10:01:07 -08:00
Tom Taylor
ad5385f1f0
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
2011-11-08 09:00:22 -08:00
Andreas Huber
4b50a6a902
Merge "Remove surface legacy APIs and code." into ics-mr1
2011-11-08 08:48:31 -08:00
John Reck
327714950f
Merge "Remove unnecessary memory allocations" into ics-mr1
2011-11-08 08:38:07 -08:00
Eric Laurent
9104b8c640
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
2011-11-08 08:32:57 -08:00
The Android Automerger
771c2ba2bf
merge in ics-mr0-release history after reset to ics-mr0
2011-11-08 06:41:10 -08:00
Narayan Kamath
951be81f21
Merge "Fix a bug in the network TTS api." into ics-mr1
2011-11-08 02:09:18 -08:00
Gilles Debunne
2240d7d0c4
Merge "No more context menu in TextView" into ics-mr1
2011-11-08 00:48:27 -08:00
