Philip P. Moltmann b02f8eb241 resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp ...

Test: Clean merge
Change-Id: Ib2420ff793fdf22fd80cfaed7848ff6b8be8d382

2017-02-14 09:51:16 -08:00

..

accessibilityservice

…

accounts

Fix @links in reference docs. am: 54de77470d

2017-01-26 04:39:57 +00:00

animation

Add API info about Keyframe and PropertyValuesHolder

2016-12-05 21:16:10 +00:00

annotation

…

app

resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp

2017-02-14 09:51:16 -08:00

appwidget

Fix @links in reference docs.

2017-01-25 17:00:55 -08:00

bluetooth

Merge "Add a mechanism to configure the default A2DP codec priorities" am: acf34d8b62

2017-02-07 00:10:21 +00:00

content

resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp

2017-02-14 09:51:16 -08:00

database

…

ddm

…

debug

…

gesture

…

hardware

Fingerprint: get auth id for non-current user.

2017-02-07 01:20:42 +00:00

inputmethodservice

Fix @links in reference docs.

2017-01-25 17:00:55 -08:00

net

Merge "Add ConnectivityManager.networkCapabilitiesForType()" am: c313123afe am: 6f32aa0259

2017-02-02 07:32:09 +00:00

nfc

nfc: Make NDEF validation stricter

2017-01-25 18:21:28 +00:00

os

Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3

2017-02-08 20:28:48 +00:00

permissionpresenterservice

…

preference

…

print

…

printservice

…

provider

Remove experimental twilight-based automatic brightness

2017-02-06 23:28:27 +00:00

security

…

service

Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e

2017-02-06 15:47:39 +00:00

speech

…

text

Fix @links in reference docs. am: 54de77470d am: ab978c035e

2017-01-26 04:44:54 +00:00

transition

…

util

Merge "Add Binder support for Parcelable exceptions." am: a2ef6b5741

2017-01-20 22:56:45 +00:00

view

Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45

2017-02-08 20:18:34 +00:00

webkit

Merge "Synchronize access to WebViewZygote." am: fd6f631de5 am: c8111e07d0

2017-01-05 09:43:53 +00:00

widget

Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev

2017-02-10 18:43:47 +00:00

package.html

…