Adam Powell 64e2b71893 resolved conflicts for merge of 6e9a021e to master ...

Change-Id: I5ea823b752e78cb9d2ef7ccec68addbaa9ca66e9

2010-09-30 13:09:43 -07:00

..

accessibilityservice

…

accounts

…

animation

…

annotation

…

app

resolved conflicts for merge of f4c3b7e9 to master

2010-09-29 12:20:51 -07:00

appwidget

…

bluetooth

Update code for new BT public APIs.

2010-09-28 20:00:53 -07:00

content

am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread

2010-09-29 17:17:22 -07:00

database

SQLiteDatabase: fix inconsistent locking

2010-09-28 13:38:14 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

…

inputmethodservice

…

net

Manual merge: Move DownloadManager to android.app

2010-09-28 17:28:43 -07:00

os

am ab9f5082: am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread

2010-09-30 11:25:26 -07:00

pim

…

preference

…

provider

resolved conflicts for merge of f4c3b7e9 to master

2010-09-29 12:20:51 -07:00

security

…

server

am c10207b6: am a5c742bf: Merge "Update local cache before sending intent." into gingerbread

2010-09-30 11:25:18 -07:00

service

…

speech

…

test

…

text

am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread

2010-09-27 14:40:38 -07:00

util

…

view

Add MotionEvent Matrix transformations.

2010-09-30 11:52:48 -07:00

webkit

am cb6f29eb: am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread

2010-09-28 13:20:05 -07:00

widget

resolved conflicts for merge of 6e9a021e to master

2010-09-30 13:09:43 -07:00

package.html

…