John Reck
888a37534f
am 2dd2e5b4: (-s ours) Merge changes I2df047b6,I791eeb3c into ics-mr0
...
* commit '2dd2e5b4eb95280bb18717c1a31ca8db40a6413b':
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
2011-10-21 14:38:32 -07:00
Dianne Hackborn
6fe0208494
am 943da7b8: Merge "Fix issue #5342788 : Setting wallpaper from gallery set default..." into ics-mr0
...
* commit '943da7b895b7cc69cdaed7979cff422a7dbaac19':
Fix issue #5342788 : Setting wallpaper from gallery set default...
2011-10-21 14:38:31 -07:00
Dirk Dougherty
7978457c29
am f1ed59bc: Merge "Doc change: fix typo in platform highlights." into ics-mr0
...
* commit 'f1ed59bcebfd3042aead8d91ee47eca38af543c6':
Doc change: fix typo in platform highlights.
2011-10-21 13:59:34 -07:00
Winson Chung
3abb9fc2ee
am 53a1b82c: Merge "Last update for screenshot animations for MR0. (Bug: 5333706)" into ics-mr0
...
* commit '53a1b82c9a2133c5c3184898335fce0826279691':
Last update for screenshot animations for MR0. (Bug: 5333706)
2011-10-21 13:59:08 -07:00
Dianne Hackborn
bfdb57b6ca
am 4bbd71a6: Merge "Fix issue #5228934 : IME shows up on boot, or when digits screen is tapped" into ics-mr0
...
* commit '4bbd71a6b2f4957f4778da13861ec03d30afbee7':
Fix issue #5228934 : IME shows up on boot, or when digits screen is tapped
2011-10-21 13:59:07 -07:00
Mike Lockwood
2775ddf89a
am 6b6bfb18: Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0
...
* commit '6b6bfb187412e4845c89d866eff0b87b6d0a5541':
PowerManagerService: Enable light sensor debug output
2011-10-21 13:59:05 -07:00
Gilles Debunne
93245acf5e
am 0499f90a: Merge "Bug 5428541: Check that span is still in text before deleting" into ics-mr0
...
* commit '0499f90a2d2774f28ca3d430dfe563391669c515':
Bug 5428541: Check that span is still in text before deleting
2011-10-21 13:59:04 -07:00
Eric Fischer
f0fcd8acdf
am 4e7ce935: (-s ours) Merge "Import revised translations." into ics-mr0
...
* commit '4e7ce9352b9c3a832715ac4b8014b2434a447172':
Import revised translations.
2011-10-21 13:59:03 -07:00
Adam Cohen
f91a2f070a
Merge "Removing fades on last item in StackView for major FPS improvement on Prime" into ics-mr0
2011-10-21 13:34:46 -07:00
Peter Ng
86079cdbff
Merge "Sharpening text edit assets"
2011-10-21 13:29:52 -07:00
George Mount
94e43502d4
Merge "Fixed spell check failing to change word."
2011-10-21 13:02:05 -07:00
RoboErik
dbbe0342d6
Merge "s/should/can"
2011-10-21 13:01:56 -07:00
John Reck
b038496fca
Merge changes I2df047b6,I791eeb3c into ics-mr0
...
* changes:
Fix rebuildWebTextView issues
DO NOT MERGE Fixed spell check failing to change word.
2011-10-21 13:01:48 -07:00
Mangesh Ghiware
24fd6e4f65
Merge "Fix issue# 5492404: Reading level check thread error."
2011-10-21 12:45:30 -07:00
Dianne Hackborn
615699532b
Merge "Fix issue #5342788 : Setting wallpaper from gallery set default..." into ics-mr0
2011-10-21 12:45:07 -07:00
Dirk Dougherty
458e581b48
Merge "Doc change: fix typo in platform highlights." into ics-mr0
2011-10-21 11:55:21 -07:00
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