Romain Guy 6f4a52a3f7 am 67e9e9df: Manual merge of 40170 (b4a107d826) DO NOT MERGE ...

Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp

* commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e':
  Manual merge of 40170 (b4a107d826) DO NOT MERGE

2010-02-17 21:17:48 -08:00

..

accessibilityservice

eclair snapshot

2009-11-13 13:53:39 -08:00

accounts

Still use ro.monkey

2010-01-06 09:52:57 -08:00

annotation

Add Annotation for optional features.

2009-12-14 17:52:20 -08:00

app

am 474731d5: Merge change I2ffe306f into eclair

2009-12-11 18:28:45 -08:00

appwidget

eclair snapshot

2009-11-13 13:53:39 -08:00

backup

eclair snapshot

2009-11-13 13:53:39 -08:00

bluetooth

Merge change I551ed729 into eclair

2009-12-21 14:17:15 -08:00

content

am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair

2010-01-21 17:35:28 -08:00

database

add eventlog message whenever sqlite reports db corruption error

2010-01-08 10:11:24 -08:00

ddm

donut snapshot

2009-05-20 11:28:04 -07:00

debug

…

emoji

…

gesture

eclair snapshot

2009-11-13 13:53:39 -08:00

hardware

Document that some parameters will not be null and fix getSupportedPictureFormats.

2009-12-08 09:41:08 +08:00

inputmethodservice

eclair snapshot

2009-11-13 13:53:39 -08:00

net

merge from eclair

2009-11-15 12:06:23 -08:00

os

framework: storage: Ensure that filesystems are unmounted before shutdown/reboot

2010-01-12 07:57:42 -08:00

pim

eclair snapshot

2009-11-13 13:53:39 -08:00

preference

eclair snapshot

2009-11-13 13:53:39 -08:00

provider

SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.

2010-01-07 12:05:01 -08:00

security

…

server

Don't set priority in Bonding state.

2010-01-11 14:16:29 -08:00

service/wallpaper

Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper

2009-11-20 16:27:27 -08:00

speech

eclair snapshot

2009-11-13 13:53:39 -08:00

test

eclair snapshot

2009-11-13 13:53:39 -08:00

text

am 8693f82d: Merge change If1f0bf33 into eclair

2009-12-02 16:23:36 -08:00

util

eclair snapshot

2009-11-13 13:53:39 -08:00

view

am 67e9e9df: Manual merge of 40170 (b4a107d826) DO NOT MERGE

2010-02-17 21:17:48 -08:00

webkit

Merge "DO NOT MERGE" into eclair

2010-02-10 09:35:37 -08:00

widget

merge from open-source master

2010-01-21 11:21:25 -08:00

package.html

…