Chris Wren be2da62d11 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev ...

am: d958f83a01

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

Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334

2016-06-02 16:41:30 +00:00

..

accessibilityservice

Reduce cost of a11y services with magnification.

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

accounts

…

animation

Add more doc for Object animators defined with a single value

2016-05-27 15:08:46 -07:00

annotation

…

app

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

2016-06-02 10:36: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

HFP 1.7 profile update (3/4)

2016-06-02 10:21:55 +00:00

content

Merge "ShortcutManager: API rename" into nyc-mr1-dev

2016-06-01 23:32:22 +00:00

database

Fix documentation bug in SQLiteDatabase

2016-05-12 16:53:10 -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

Make IMS#clearInsetOfPreviousIme() reliable.

2016-05-15 20:05:56 -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

2016-05-26 17:59:23 +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

2016-06-01 17:13:15 +00:00

permissionpresenterservice

…

preference

…

print

…

printservice

…

provider

resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev

2016-06-02 16:41:30 +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

2016-05-26 16:12:55 +00:00

speech

…

test

…

text

Support ellipsizing LocaleHelper.getDisplayLocaleList()

2016-05-27 06:46:26 +00:00

transition

…

util

Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev

2016-06-01 21:55:05 +00:00

view

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

2016-05-31 19:39:47 +00:00

webkit

Load WebView even if WebView relro creation times out.

2016-05-23 17:49:05 +01:00

widget

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

2016-05-31 19:34:05 +00:00

package.html

…