Dianne Hackborn 5101b95710 resolve merge conflicts of e174476 to master ...

Change-Id: I4005cf91b8a6bf3faa2301d8ce97ab1ad5eed94f

2016-06-01 12:01:38 -07:00

..

accessibilityservice

…

accounts

…

animation

Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev am: d01f474773

2016-05-28 01:00:20 +00:00

annotation

…

app

resolve merge conflicts of e174476 to master

2016-06-01 12:01:38 -07:00

appwidget

Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev

2016-05-25 20:45:44 +00:00

bluetooth

Merge "Properly check if BT is off when shutting down radios" into nyc-mr1-dev am: 0f760e0815

2016-05-27 19:17:03 +00:00

content

Merge "Update override config to include some changes from global config" into nyc-dev am: 88be465ce5 am: ae01e27755

2016-06-01 01:34:52 +00:00

database

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

ddm

…

debug

…

gesture

…

hardware

Merge "DO NOT MERGE Remove Pointer Capture API" into nyc-dev am: c396f0f70e

2016-05-26 14:51:30 +00:00

inputmethodservice

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

net

Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e am: fdc53e96d3

2016-05-27 17:42:22 +00:00

nfc

Merge "Adddress NFC API review comments." into nyc-dev am: 1fef88d8dc

2016-05-17 18:39:50 +00:00

os

Merge "Trigger power hints for activity launch" into nyc-mr1-dev am: 2ab4ac3835

2016-06-01 03:21:56 +00:00

permissionpresenterservice

…

preference

…

print

…

printservice

…

provider

resolve merge conflicts of e174476 to master

2016-06-01 12:01:38 -07:00

security

Use an attribute for the network security config resource

2016-05-19 17:25:41 -07:00

service

Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d

2016-05-26 16:31:58 +00:00

speech

…

test

…

text

Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 am: 5f55e2c43d

2016-05-31 01:32:39 +00:00

transition

Merge "Add missing @Deprecated annotations."

2016-05-25 17:46:40 +00:00

util

resolve merge conflicts of e174476 to master

2016-06-01 12:01:38 -07:00

view

Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 am: 80b8e67a99

2016-05-31 19:54:41 +00:00

webkit

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

widget

Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 am: 1968ffe284

2016-05-31 19:51:29 +00:00

package.html

…