Adam Powell b85afc25d5 resolved conflicts for merge of 1178569b to master ...

Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e

2012-06-05 20:08:41 -07:00

..

accessibilityservice

Fixing the build for real.

2012-05-16 19:15:34 -07:00

accounts

Fix bug where existing account not pre-checked

2012-05-31 15:48:51 -07:00

animation

Skip LayoutTransition animations on objects of size (0,0)

2012-06-01 15:09:07 -07:00

annotation

…

app

resolved conflicts for merge of 1178569b to master

2012-06-05 20:08:41 -07:00

appwidget

Merge "Cap widget bitmap usage by screen size (issue 6464700)" into jb-dev

2012-05-16 13:43:27 -07:00

bluetooth

Enhance StateMachine Quitting and logging support.

2012-05-29 12:40:46 -07:00

content

am 3522225d: am ea01e4a2: Merge "Survey says: NIET!" into jb-dev

2012-06-02 08:20:36 -07:00

database

Enable SQLite configuration to be set with system properties.

2012-05-11 16:36:24 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Fix race condition with preview callback.

2012-05-30 17:06:54 -07:00

inputmethodservice

Add/refine comments to reflect key event policies

2012-05-29 19:41:02 +09:00

net

Enhance StateMachine Quitting and logging support.

2012-05-29 12:40:46 -07:00

nfc

NFC API documentation.

2012-05-16 19:44:45 -07:00

os

Add camera as an ATRACE tag

2012-05-31 18:12:18 -07:00

preference

Avoid launching dialogs twice from double-clicking a preference.

2012-05-16 17:02:32 -07:00

provider

am eef4bc08: am 615fd3df: Merge "Implement new rotation policy." into jb-dev

2012-06-05 19:20:08 -07:00

server

am c383b407: am cee7203f: Merge "Send device connection intents from AudioService" into jb-dev

2012-05-31 08:29:29 -07:00

service

Implement new window cropping.

2012-05-13 13:31:06 -07:00

speech

New action and extra in RecognizerIntent for "hands free" voice search

2012-05-17 15:43:40 -07:00

test

…

text

am 887568c4: am 01bf82f2: Merge "Add/refine comments to reflect key event policies" into jb-dev

2012-05-29 18:10:13 -07:00

util

am 85dc303f: am e9aa4b27: Merge "Add additional debug for time zone handling." into jb-dev

2012-05-10 23:19:57 -07:00

view

resolved conflicts for merge of 1178569b to master

2012-06-05 20:08:41 -07:00

webkit

am f671e430: am 804e822c: Merge "Fix logspam" into jb-dev

2012-06-05 16:56:38 -07:00

widget

Merge "Make CheckBox / RadioButton / ToggleButton / Star widgets aware of layout direction"

2012-06-05 17:16:31 -07:00

package.html

…