Robert Carr 0db4052d51 resolve merge conflicts of 79116da to master ...

Change-Id: Ia6e42d99097da86e23b9d33659259d264a365c45

2016-06-22 12:39:12 -07:00

..

accessibilityservice

…

accounts

…

animation

Notify end animation after setting the state to not running.

2016-06-14 10:35:31 -07:00

annotation

…

app

Merge \\\"Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\\" into nyc-dev am: a62a7eef24 am: 56197c9e9e

2016-06-22 17:35:40 +00: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 \\"Guard concurrent accesses to BluetoothA2dp service object\\" into nyc-mr1-dev am: 30ec4f2732

2016-06-22 02:44:20 +00:00

content

Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp

2016-06-22 00:55:32 +00:00

database

Add missing @Deprecated annotations.

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

ddm

…

debug

…

gesture

…

hardware

Merge \"Merge \\"Enable tap-to-pulse only when needed\\" into nyc-mr1-dev am: d94a40f46d\" into nyc-mr1-dev-plus-aosp

2016-06-20 18:52:06 +00:00

inputmethodservice

Add missing @Deprecated annotations.

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

net

Merge \\"ConnectivityMetricsLogger subclass for IpConnectivity\\" into nyc-mr1-dev am: ce2c5fa466

2016-06-09 05:25:29 +00:00

nfc

…

os

Merge \\\"Reduce race when connecting to an existing content provider.\\\" into nyc-dev am: 5f9afa968d am: 3716762e38

2016-06-21 19:38:50 +00:00

permissionpresenterservice

…

preference

…

print

Add event tracking to print UI.

2016-06-20 11:50:44 -07:00

printservice

…

provider

Merge \\\"Fix a race in local settings caches\\\" into nyc-dev am: f4ddb7ce30 am: ee4c0a3c7e

2016-06-18 02:29:12 +00:00

security

Add getApplicationConfigForPackage

2016-06-20 12:40:20 -07:00

service

Merge \\\"QS Tiles: Fix some problems with connecting through intent\\\" into nyc-dev am: 126088536d am: a5076ef7fa

2016-06-22 17:18:52 +00:00

speech

…

test

…

text

Need break to stop unexpected fall through

2016-06-20 05:20:22 +00:00

transition

Remove TransitionListener after transition completes.

2016-06-14 14:11:28 -07:00

util

Merge \\"Add DENSITY_260, DENSITY_300, DENSITY_340\\" into nyc-mr1-dev am: e37ee119c2

2016-06-15 22:58:23 +00:00

view

resolve merge conflicts of 79116da to master

2016-06-22 12:39:12 -07:00

webkit

Merge \\\"Use newly fetched PackageInfo for loading WebView code.\\\" into nyc-dev am: cdbf412f8e am: deac870fd1

2016-06-20 18:52:02 +00:00

widget

Merge \\\"Don\\\'t try and resolve WRAP_CONTENT too early.\\\" into nyc-dev am: 72ce991692 am: 5a35355364

2016-06-22 00:12:18 +00:00

package.html

…