Commit Graph

40034 Commits

Author SHA1 Message Date
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
Dave Burke
15ecb5636f am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
* commit '23d644202a44383bf008ff86f6faa3ea7e447290':
  Stagefright: idle OMX after ANW errors
2011-10-19 22:38:45 -07:00
Dave Burke
3b3bc00202 Merge "Stagefright: idle OMX after ANW errors" into ics-mr0 2011-10-19 22:37:18 -07:00
Winson Chung
9966ca02bc am 44630c72: Merge "Updating the screenshot notification icons." into ics-mr0
* commit '44630c72651803ba1dedba3b5352cad8a8a62ace':
  Updating the screenshot notification icons.
2011-10-19 21:39:31 -07:00
Winson Chung
13228830dd Merge "Updating the screenshot notification icons." into ics-mr0 2011-10-19 21:36:32 -07:00
Svetoslav Ganov
db00d3936a am 5dc30a77: Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0
* commit '5dc30a770ab1b4f07ff10502f9de9ec39daac41d':
  DatePicker crashes when going from 2036 to 2035 via ▼
2011-10-19 21:17:14 -07:00
Svetoslav Ganov
976161cc6f Merge "DatePicker crashes when going from 2036 to 2035 via ▼" into ics-mr0 2011-10-19 21:15:30 -07:00
Jim Miller
f14ab8db48 am 2f35281a: Merge "Fix 5485925: Fix crash in transport control view" into ics-mr0
* commit '2f35281ae0ae4471527e9286f022cb960384044e':
  Fix 5485925: Fix crash in transport control view
2011-10-19 20:50:45 -07:00
Jim Miller
8629ede03a Merge "Fix 5485925: Fix crash in transport control view" into ics-mr0 2011-10-19 20:49:33 -07:00
Chih-Chung Chang
851743dcd7 am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforced
* commit 'f806871f3016a8184de4c9dcfbe0b9069dc0d72c':
  Fix 5487571: Make sure shutter sound is played when it's enforced
2011-10-19 20:09:13 -07:00
The Android Automerger
ecb90864e7 merge in ics-mr0-release history after reset to ics-mr0 2011-10-19 19:01:02 -07:00
Maarten Hooft
240d3a621b am d47d4f7b: Merge "Add a delay before walled garden test" into ics-mr0
* commit 'd47d4f7b7713a4a05da7ea55c3e698b939fe81b1':
  Add a delay before walled garden test
2011-10-19 18:23:20 -07:00
Maarten Hooft
60b195831c Merge "Add a delay before walled garden test" into ics-mr0 2011-10-19 18:21:56 -07:00
Svetoslav Ganov
bea249e4ca am 06044fe1: Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0
* commit '06044fe114f7f07c15b0ba92740829cb8896766b':
  AccessibilityServiceInfo does not report properly the feedback type.
2011-10-19 18:18:44 -07:00
Svetoslav Ganov
980cb0421c Merge "AccessibilityServiceInfo does not report properly the feedback type." into ics-mr0 2011-10-19 18:15:52 -07:00
Daniel Sandler
8b3fc251f2 am 84e825a8: Merge "Add hasNavigationBar() to the window manager." into ics-mr0
* commit '84e825a84d7dde03042228c79638935c92d13c92':
  Add hasNavigationBar() to the window manager.
2011-10-19 18:07:18 -07:00
Dirk Dougherty
6ac4448391 am 62ade220: Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
* commit '62ade220d9b72a9edc8fcc4dfe98ca9541c6d501':
  Doc change: add video to platform highlights and fix a few things.
2011-10-19 18:07:16 -07:00