Rakesh Iyer d223fb7136 resolve merge conflicts of 72c0452 to master ...

Change-Id: I1b9e27569762afe14935d75d35438cbd271c11cb

2016-04-22 13:07:45 -07:00

..

accessibilityservice

Treat accessibility gestures like physical ones.

2016-04-07 12:20:27 -07:00

accounts

Merge "introduce GET_PASSWORD_PRIVILEDGED permission." into nyc-dev

2016-04-01 20:08:58 +00:00

animation

Merge "Fix pause/resume for AnimatorSet" into nyc-dev

2016-04-19 22:14:37 +00:00

annotation

…

app

resolve merge conflicts of 72c0452 to master

2016-04-22 13:07:45 -07:00

appwidget

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

bluetooth

OobData documentation

2016-04-19 17:36:12 +00:00

content

Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev am: 1a83df8ba7 am: 9e16d11683

2016-04-22 17:06:50 +00:00

database

Fix sqlite time measurement.

2016-04-07 09:42:17 -07:00

ddm

Send nativeDebuggable byte value as part of HELLO response.

2016-04-05 07:25:18 -07:00

debug

…

gesture

…

hardware

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev

2016-04-21 17:11:55 +00:00

inputmethodservice

Customizes input extract edit view for Wear

2016-04-12 15:05:13 +00:00

net

Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: cbb0d77bcd

2016-04-22 09:55:38 +00:00

nfc

frameworks/base: Avoid Long object allocations in Long.valueOf()

2016-04-22 13:36:53 +01:00

os

Merge "fix build: remove SUSTAINED_PERFORMANCE_WAKE_LOCK link" into nyc-dev am: 316c68f144 am: fb8c76df29

2016-04-21 02:57:25 +00:00

preference

Revert "Add Preference#onDetachedFromActivity"

2016-04-05 14:13:32 +00:00

print

Rename 'thousands of an inch' to 'thousandths of an inch'in the docs.

2016-04-21 16:29:43 -07:00

printservice

Print API for N: Fix docs and change interfaces as requested.

2016-04-20 13:42:18 -07:00

provider

Merge "Doze settings example not matching real keys" am: 570a13f

2016-04-20 23:42:01 +00:00

security

Fix isUserAddedCertificate

2016-04-13 10:20:08 -07:00

service

frameworks/base: Avoid Long object allocations in Long.valueOf()

2016-04-22 13:36:53 +01:00

speech

Fix issue when QUEUE_DESTROY arrive at the same time.

2016-04-08 11:18:23 +01:00

test

…

text

Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev

2016-04-20 18:35:57 +00:00

transition

Disable suppressLayout in Visibility Activity Transitoins.

2016-03-22 13:41:57 -07:00

util

Update autoLink URL regex to match empty path, $ and _

2016-04-13 20:10:47 +00:00

view

Merge "FrameMetricsListener API council changes" into nyc-dev am: 82ee675330 am: 2e9c311abd

2016-04-22 16:38:49 +00:00

webkit

webview: canInvokeDrawGlFunctor should always return true

2016-04-20 09:03:53 -07:00

widget

Merge "Fixed a bug where notification header could become empty" into nyc-dev am: 57e4a67be1 am: 0aef73a252

2016-04-22 05:46:40 +00:00

package.html

…