Colin Cross 2268fc12b5 resolve merge conflicts of 1095b21 to master ...

Change-Id: I611579044234435a07cad2f64930b731e53aec77

2016-08-25 22:18:33 -07:00

..

accessibilityservice

Limit capabilities of a11y gesture dispatch.

2016-08-11 20:41:46 +00:00

accounts

resolve merge conflicts of eeeebd3 to master

2016-08-24 00:13:36 -07:00

animation

Fix out of order listener callback for animator set containing empty sets

2016-08-22 14:30:48 -07:00

annotation

…

app

Document and deprecate various old, undocumented classes

2016-08-25 12:38:46 -07:00

appwidget

…

bluetooth

resolve merge conflicts of 5671277 to stage-aosp-master am: 5aa4ba3776 am: 84b61fb4b0

2016-08-11 23:17:53 +00:00

content

resolve merge conflicts of eeeebd3 to master

2016-08-24 00:13:36 -07:00

database

…

ddm

…

debug

…

gesture

…

hardware

allow external USB host management

2016-08-24 15:00:08 -07:00

inputmethodservice

…

net

Refactored whitelist restrict background uids.

2016-08-23 12:34:37 -07:00

nfc

…

os

Fix AsyncTask to handle exceptions in doInBackground am: 78a8e9d293 am: 7697ba2602

2016-08-26 02:21:21 +00:00

permissionpresenterservice

…

preference

Add titles to PreferenceFragments and PreferenceScreens for watches.

2016-07-26 21:11:47 +00:00

print

…

printservice

…

provider

Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-mr1-dev am: bd43552975 am: 24eaf0c700

2016-08-23 22:33:04 +00:00

security

Merge "Add stub isCTVerificationRequired methods" am: 5b63231a31 am: 6e1f860c6a am: 10943c69a2

2016-08-09 20:10:01 +00:00

service

Do not toggle OEM unlock if bootloader unlocked am: c48b20f8f1 am: 83583bd596

2016-08-11 19:11:52 +00:00

speech

…

test

…

text

TextView - fix ClickableSpans always triggering on touch up

2016-08-12 10:21:08 +00:00

transition

…

util

Clean up style issues in ArraySet.

2016-08-19 16:36:19 -07:00

view

Modernize RenderNode JNI

2016-08-24 15:55:27 -07:00

webkit

WebView: Use static factory method to create provider

2016-08-20 16:13:25 -07:00

widget

resolve merge conflicts of 1095b21 to master

2016-08-25 22:18:33 -07:00

package.html

…