Chris Wren 3a716c735b resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01 ...

am: be2da62d11

* commit 'be2da62d11227c564817906c5df0ceb151ed2436':
  make the notification enqueue rate threshold a setting

Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed

2016-06-02 16:48:13 +00:00

..

accessibilityservice

Reduce cost of a11y services with magnification.

2016-05-09 16:21:29 -07:00

accounts

…

animation

Throw Exception for wrong valueType with API guard

2016-06-01 14:22:28 -07:00

annotation

…

app

Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp

2016-06-02 11:21:02 +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

HFP 1.7 profile update (3/4) am: 0d98ebf997

2016-06-02 10:52:32 +00:00

content

Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7

2016-06-02 00:50:25 +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 "Add an intent extra to force master clear" into nyc-mr1-dev am: 3c826b160c

2016-06-01 21:08:13 +00:00

permissionpresenterservice

…

preference

…

print

…

printservice

…

provider

resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01

2016-06-02 16:48:13 +00: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

Merge "Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf am: 815c681f42" into nyc-mr1-dev-plus-aosp

2016-06-02 00:30:09 +00: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

…