Dianne Hackborn a7f88508d3 resolved conflicts for merge of 872a1e79 to master ...

Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74

2011-06-16 16:01:27 -07:00

..

accessibilityservice

…

accounts

…

animation

…

annotation

…

app

resolved conflicts for merge of 872a1e79 to master

2011-06-16 16:01:27 -07:00

appwidget

…

bluetooth

Refactor Bluetooth Profile.

2011-06-14 21:29:52 -07:00

content

Merge "Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelySubtags"

2011-06-15 17:49:24 -07:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

…

inputmethodservice

…

net

Merge "DownloadManager flags for network policy."

2011-06-16 13:39:02 -07:00

nfc

…

os

Merge f28f1de3 - regen current.txt

2011-06-16 10:21:18 -07:00

pim

…

preference

Inline SeekBarPreference

2011-06-16 12:34:02 -07:00

provider

Merge "Add DroidDocs to Events class"

2011-06-16 13:51:16 -07:00

server

Refactor Bluetooth Profile.

2011-06-14 21:29:52 -07:00

service/wallpaper

…

speech

Merge "Don't enforce defaults any more in the TextToSpeech API."

2011-06-16 03:05:07 -07:00

test

…

text

…

util

Update getLayoutDirectionFromLocale() for using ICU

2011-06-16 14:40:31 -07:00

view

Merge "Fix crash in ViewPropertyAnimator for unparented view."

2011-06-16 14:06:36 -07:00

webkit

…

widget

Future-proofing: change Alignment interface to abstract class and add a parameter for measurementType.

2011-06-15 19:08:40 -07:00

package.html

…