Dianne Hackborn fee1c69a49 resolved conflicts for merge of 77dd616e to master ...

Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2

2011-05-25 16:36:50 -07:00

..

accessibilityservice

…

accounts

Tolerate missing AccountManager resource, not just missing resource name

2011-04-07 11:58:37 -07:00

animation

Add ability to transition parent hierarchy in layout transitions

2011-05-24 15:29:39 -07:00

annotation

…

app

resolved conflicts for merge of 77dd616e to master

2011-05-25 16:36:50 -07:00

appwidget

…

bluetooth

am 37677849: am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

2011-04-18 15:28:47 -07:00

content

resolved conflicts for merge of 77dd616e to master

2011-05-25 16:36:50 -07:00

database

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

ddm

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

debug

…

emoji

…

gesture

Fix javadoc issues

2011-05-16 11:53:31 -07:00

hardware

resolved conflicts for merge of c1730dcf to master

2011-05-19 13:34:44 -04:00

inputmethodservice

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -07:00

net

Observe screen on/off events in NetworkPolicy.

2011-05-23 18:39:56 -07:00

nfc

Add public API to do NDEF push.

2011-05-24 15:22:07 -05:00

os

Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"

2011-05-24 14:26:18 -07:00

pim

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

preference

DO NOT MERGE. Preference activity changes to work on smaller tablet screens.

2011-05-23 16:53:16 -07:00

provider

Add original_id definition for cal db v301

2011-05-20 15:37:28 -07:00

security

…

server

am e2271a55: am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."

2011-05-21 21:35:16 -07:00

service/wallpaper

Rename ViewRoot to ViewAncestor.

2011-05-04 14:08:11 -07:00

speech

Add a separate thread for writing to audiotracks.

2011-05-25 15:31:06 +01:00

test

…

text

TextView uses floats for touch event positions.

2011-05-23 18:20:26 -07:00

util

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

view

resolved conflicts for merge of 77dd616e to master

2011-05-25 16:36:50 -07:00

webkit

Merge "Merge Chromium at 10.0.634.0: Add autofill fax string"

2011-05-25 12:09:46 -07:00

widget

Merge "Action bar tab layout"

2011-05-25 12:01:00 -07:00

package.html

…