Etan Cohen ccb0b65be6 resolve merge conflicts of 6ffbcb3 to master ...

Change-Id: I23af5223f0e9810aa90fda4594ff6ccfc69b4053

2016-08-19 11:22:06 -07:00

..

accessibilityservice

Limit capabilities of a11y gesture dispatch.

2016-08-08 10:23:17 -07:00

accounts

Account Manager Push API

2016-08-02 14:57:06 -07:00

animation

Fix NPE in ValueAnimator am: 543a7ed7af

2016-07-26 15:11:27 +00:00

annotation

Add @AnyThread, @Dimension and @Px

2016-06-28 12:42:37 -07:00

app

resolve merge conflicts of 6ffbcb3 to master

2016-08-19 11:22:06 -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

Merge "More settings cleanup"

2016-08-15 17:17:51 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "Avoid caching services with missing binders."

2016-08-11 18:52:03 +00:00

inputmethodservice

Merge \"Merge \\"Use a flag to grant a temporary URI permission.\\" into nyc-mr1-dev am: cb56978912\" into nyc-mr1-dev-plus-aosp

2016-06-27 20:34:58 +00:00

net

Merge "Support timeouts for requestNetwork() invocations."

2016-08-17 17:15:46 +00:00

nfc

…

os

Support one-way methods in java support for hardware binder.

2016-08-18 14:29:40 -07:00

permissionpresenterservice

…

preference

Add titles to PreferenceFragments and PreferenceScreens for watches.

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

print

Fix doc for default print document content type

2016-07-06 17:18:44 -07:00

printservice

…

provider

[media] Separate ringtones for managed profiles

2016-08-18 09:58:26 +01: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

Merge "Return proper values from ChangeScroll.getTransitionProperties"

2016-06-27 18:39:14 +00:00

util

Allow calls to TimedRemoteCaller in parallel.

2016-08-12 14:19:18 -07:00

view

Merge "Add ViewConfiguration.getScaledScrollFactor()"

2016-08-18 21:16:49 +00:00

webkit

Fix document format

2016-07-27 15:44:54 -07:00

widget

TextView - fix ClickableSpans always triggering on touch up

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

package.html

…