Commit Graph

40400 Commits

Author SHA1 Message Date
Winson Chung
f8bf356c3e Merge "Last update for screenshot animations for MR0. (Bug: 5333706)" into ics-mr0 2011-10-21 11:07:06 -07:00
Dianne Hackborn
9ed4fbc0cd Merge "Fix issue #5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0 2011-10-21 11:03:34 -07:00
RoboErik
d43e420ee6 Merge "Color API comment updates." 2011-10-21 11:00:40 -07:00
Mike Lockwood
b3edff3264 Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0 2011-10-21 10:26:55 -07:00
Gilles Debunne
307f970b88 Merge "Bug 5428541: Check that span is still in text before deleting" into ics-mr0 2011-10-21 09:48:07 -07:00
Eric Fischer
07c74bdad2 Merge "Import revised translations." into ics-mr0 2011-10-21 09:34:22 -07:00
Kristian Monsen
87e18446c5 Merge "WebView part of fix for bug 5307956" 2011-10-21 04:48:22 -07:00
Jake Hamby
df27253f83 Merge "Add wrapper classes for UICC service tables." 2011-10-21 00:49:41 -07:00
satok
4850ca9760 am 2cf1cf09: Fix possible NPE
* commit '2cf1cf098513807ffd3420ae106f438e943d0cd8':
  Fix possible NPE
2011-10-20 23:35:27 -07:00
Romain Guy
25e6e077af Merge "Make sure 9patches are not filtered when not necessary Bug #5383406" 2011-10-20 20:33:51 -07:00
Fabrice Di Meglio
b3e39c43bb Merge "Fix compilation issue when DEBUG_GLYPHS define is activated" 2011-10-20 18:58:03 -07:00
Mathias Agopian
7ec662c07a am 16bece04: Merge "added dpi and refresh rate info in SF\'s dumpsys" into ics-mr0
* commit '16bece04bdbac9af5228436f70267ec5763315de':
  added dpi and refresh rate info in SF's dumpsys
2011-10-20 17:48:02 -07:00
Mathias Agopian
52cbf99446 Merge "added dpi and refresh rate info in SF's dumpsys" into ics-mr0 2011-10-20 17:45:55 -07:00
Jim Miller
4da8dfc68d am 6b024448: Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0
* commit '6b0244485c1d20261cffb0fbabebdfefd701867e':
  Fix 5493266: Properly restore background after playing music
2011-10-20 17:35:51 -07:00
Jim Miller
3b91d48938 Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0 2011-10-20 17:33:42 -07:00
Mathias Agopian
d5e4ef9e43 added dpi and refresh rate info in SF's dumpsys
Change-Id: I2327248eb1993689367e3daeaccba74c172dfceb
2011-10-20 17:22:38 -07:00
Jake Hamby
6df428aaf9 Merge "Add new RIL requests to support SIM data download via SMS over IMS." 2011-10-20 16:55:48 -07:00
Adam Powell
14bb3fabc2 am a5c371bf: Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0
* commit 'a5c371bf1fc878f84c296a63839a5d031dea843f':
  Bug 5275928 - Invasion of the monkeys
2011-10-20 16:26:56 -07:00
Adam Powell
f9f0de7671 Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0 2011-10-20 16:25:04 -07:00
Iliyan Malchev
b5fe317b91 add -ldl to host executables
This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.

Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-10-20 16:21:25 -07:00
The Android Automerger
dc26935d7d merge in ics-mr0-release history after reset to ics-mr0 2011-10-20 15:49:44 -07:00
Michael Chan
1810457f47 Merge "Fix typos" 2011-10-20 15:42:30 -07:00
Gilles Debunne
7837769433 Merge "Renaming of a hidden API: ShowSoftInputOnFocus" 2011-10-20 15:35:34 -07:00
Gilles Debunne
1ae72169c7 Merge "Typo in ViewRootImpl" 2011-10-20 15:35:20 -07:00
Gilles Debunne
50c7dc935a Merge "Wrong word cut at end of lines with spaces" 2011-10-20 15:35:12 -07:00
Irfan Sheriff
89b0412ce3 am 2159927f: Merge "Fix handling in DisconnectingState" into ics-mr0
* commit '2159927f366fd8a617128df60865923e131cad7b':
  Fix handling in DisconnectingState
2011-10-20 15:07:46 -07:00
Irfan Sheriff
8d5836a68a Merge "Fix handling in DisconnectingState" into ics-mr0 2011-10-20 15:05:07 -07:00
Dirk Dougherty
b0bc5193f0 am 957ad44e: Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
* commit '957ad44e9c6f1415dae85a0177d37c3a69f1e955':
  Doc change: minor fixes to ICS highlights.
2011-10-20 14:34:50 -07:00
Dirk Dougherty
8d5932f6a6 Merge "Doc change: minor fixes to ICS highlights." into ics-mr0 2011-10-20 14:32:19 -07:00
Svetoslav Ganov
3fb893df15 Merge "Add content description setter to RemoteViews" 2011-10-20 14:29:18 -07:00
Jason Sams
6651db884e Merge "adding getters to Sampler ProgramRaster, ProgramStore, Element. Element adds ability to get subelement info. Tests for new stuff." 2011-10-20 13:54:37 -07:00
Jason Sams
06dbda5883 Merge "Remove ObjBaseRef from the hal struct" 2011-10-20 13:52:43 -07:00
Jason Sams
606ba3f448 Merge "Fixes and optimizations of two quaternion functions." 2011-10-20 13:49:59 -07:00
Christopher Tate
af397bd468 Merge "Don't inappropriately kill ANRing drop recipients" 2011-10-20 13:21:07 -07:00
Daniel Sandler
82221e84ca am d2cd1f72: Merge "Lazily fetch the status bar service." into ics-mr0
* commit 'd2cd1f722421c33e88df92d036663f30b316fa3f':
  Lazily fetch the status bar service.
2011-10-20 13:11:15 -07:00
Daniel Sandler
fb4f927651 Merge "Lazily fetch the status bar service." into ics-mr0 2011-10-20 13:08:36 -07:00
Scott Main
f47426d3ab am b321cd99: docs: fix tools release notes links
* commit 'b321cd99c24272494bb9af5662c18c5bdc507186':
  docs: fix tools release notes links
2011-10-20 13:05:38 -07:00
Eric Fischer
75a48b2ca9 am 7ec4284a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '7ec4284ab2026a82e6904a4974db8f947c159960':
  Import revised translations.  DO NOT MERGE
2011-10-20 11:29:19 -07:00
Eric Fischer
917d5f5a01 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-10-20 11:25:44 -07:00
Michael Chan
44da94876f Merge "Update comments for Calendar ExtendedProperties." 2011-10-20 10:51:58 -07:00
Daniel Sandler
b48315fdd9 am 0d6ff010: Tune wifi RSSI code (see bug 5241139).
* commit '0d6ff01050af1bc37ee383c9c7ed1b3a3aa775bf':
  Tune wifi RSSI code (see bug 5241139).
2011-10-20 10:50:54 -07:00
The Android Open Source Project
122e172492 Reconcile with ics-mr0-release
Change-Id: I21c521bc9659ba52a8a48a9f142befa418e0896c
2011-10-20 09:17:09 -07:00
Jesse Hall
83d3fa10d5 Merge "SurfaceTexture: add tests for buffer leaks" 2011-10-20 09:09:31 -07:00
satok
84b0ad77b2 am 1301f092: Merge "Update links for SampleSpellCheckerService for I938ba499" into ics-mr0
* commit '1301f092e5bd520821c54c788a07cbdfda49df7b':
  Update links for SampleSpellCheckerService for I938ba499
2011-10-20 08:44:39 -07:00
satok
5a0acf42b4 Merge "Update links for SampleSpellCheckerService for I938ba499" into ics-mr0 2011-10-20 08:42:50 -07:00
Justin Ho
ad1a519338 am 9397f580: Merge "Add louder keypress sounds for different device configurations" into ics-mr0
* commit '9397f5807b5377c5edef99820614694cc7e05160':
  Add louder keypress sounds for different device configurations
2011-10-20 07:29:31 -07:00
Justin Ho
1972295eed Merge "Add louder keypress sounds for different device configurations" into ics-mr0 2011-10-20 07:25:14 -07:00
The Android Automerger
12fe68fdd8 merge in ics-mr0-release history after reset to ics-mr0 2011-10-20 06:28:24 -07:00
Jean Chalard
cdeec915cd Merge "Fix a warning from the binder, step 2." 2011-10-20 05:36:26 -07:00
Jean Chalard
2f69cae4a4 Merge "Fix a warning from the binder, step 3." 2011-10-20 05:26:29 -07:00