Nick Pelly 089c3c7c0b resolved conflicts for merge of 28e8c66d to master ...

Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c

2010-12-06 11:50:47 -08:00

..

accessibilityservice

…

accounts

add caching to the AccountManagerService

2010-12-03 15:35:48 -08:00

animation

Merge "Add methods to AnimatorSet that take collections"

2010-12-01 11:15:39 -08:00

annotation

…

app

Merge "Hide navigation buttons and clock on lockscreen."

2010-12-06 11:15:45 -08:00

appwidget

Adding widget auto-advance capability

2010-11-10 17:18:37 -08:00

bluetooth

Fix some formatting issues.

2010-11-24 13:07:29 -08:00

content

Merge "add caching to the AccountManagerService"

2010-12-06 09:55:54 -08:00

database

if db close() fails due to un-closed sql statements, print useful msg

2010-11-29 14:10:46 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add two methods to Camera.java

2010-12-01 15:38:06 -08:00

inputmethodservice

Added support for full PC-style keyboards.

2010-11-18 09:49:03 -08:00

net

Cleanup logging.

2010-12-03 12:01:38 -08:00

nfc

Fixed technology name typo's.

2010-12-01 14:16:59 +01:00

os

Get rid of vm-internal constants.

2010-11-30 23:55:12 -08:00

pim

Refrain warning when not appropriate. Do not merge

2010-10-04 07:59:34 -07:00

preference

Fix bug 3245210 - Bad window style for action modes for light holo dialog theme

2010-12-05 18:29:10 -08:00

provider

sampling profiler hz -> ms

2010-12-02 15:30:23 -08:00

security

…

server

Update BT code for voice capability cases.

2010-11-24 10:49:47 -08:00

service/wallpaper

Add method for sending wallpaper commands directly to an engine.

2010-12-03 11:35:42 -08:00

speech

…

test

Added RepetitiveTest annotation and test runner support

2010-10-19 18:23:18 -07:00

text

Fix in vertical measurement in text lines with different text sizes

2010-12-02 16:18:54 -08:00

util

Merge "Don't drop zeros in the second position in formatDuration()"

2010-11-24 03:25:17 -08:00

view

fixing getLocationInWindow

2010-12-03 18:05:12 -08:00

webkit

Merge "Call flushCookieStore() from CookieSyncManager."

2010-12-06 05:40:48 -08:00

widget

Merge "Made TextView use the new localState API for drag info"

2010-12-06 10:22:12 -08:00

package.html

…