Ajay Panicker 0a3411a29b resolve merge conflicts of 06b8324d02 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I29b117df6803fd59faafe97a02b8ab2d34741f0e

2017-05-04 17:12:27 -07:00

..

accessibilityservice

Merge "Fix accessibility button CTS test" into oc-dev

2017-05-01 19:49:13 +00:00

accounts

Use invalid package names for special keys in AccountManager.

2017-04-27 19:15:57 +00:00

animation

Refine JavaDocs for AnimatorSet#getCurrentPlayTime()

2017-04-26 22:08:24 +00:00

annotation

Even more auto-doc work.

2017-04-24 13:20:46 -06:00

app

Merge "Fix frozen alarm issue" into oc-dev am: af4bfcdb7e

2017-05-04 21:44:22 +00:00

appwidget

Valid resource IDs may be negative

2017-04-28 12:48:36 -07:00

bluetooth

Merge "Limit btsnoop file size (3/9)" into oc-dev

2017-05-04 22:56:21 +00:00

companion

API fixes for Companion renaming

2017-04-28 16:07:50 -07:00

content

Time zone update API classes

2017-05-04 15:58:40 +01:00

database

Merge "Remove support for auto-paging of cursors." into oc-dev

2017-04-13 18:26:43 +00:00

ddm

…

debug

…

gesture

…

hardware

Merge "Adding feature: input device disable/enable."

2017-05-04 18:51:27 +00:00

inputmethodservice

Remove unnecessary casts on calls to findViewById

2017-04-14 11:15:50 -04:00

metrics

expose the UID in the EventLog API

2017-04-28 11:18:07 -04:00

net

Merge changes from topic 'allow_none_scorer' into oc-dev

2017-05-03 23:05:51 +00:00

nfc

…

os

Merge "Revert "O is API 26"" into oc-dev am: b42b9a22df

2017-05-04 00:23:27 +00:00

permissionpresenterservice

…

preference

Set icon frame to invisible when iconSpaceReserved is set.

2017-04-24 10:05:12 -07:00

print

…

printservice

…

provider

resolve merge conflicts of 06b8324d02 to master

2017-05-04 17:12:27 -07:00

security

Add device ID attestation method to keymaster

2017-04-26 17:40:44 +02:00

service

Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev am: 1d01f9cf67

2017-05-04 05:29:12 +00:00

speech

Updates based on API council guidance.

2017-04-29 13:14:17 -06:00

text

Don't copy NoCopySpans for assist and autofill

2017-05-02 13:33:07 -07:00

transition

Fix ChangeClipBounds to set final clip to null.

2017-04-20 09:12:20 -07:00

util

Merge "expose the UID in the EventLog API" into oc-dev am: 8ae5e04636

2017-04-28 18:02:57 +00:00

view

Merge "Adding feature: input device disable/enable."

2017-05-04 18:51:27 +00:00

webkit

Merge "Add a time-out for connecting to SystemServer, and WebView, zygotes."

2017-05-02 10:00:27 +00:00

widget

Merge "Only classify text when the toolbar is shown." into oc-dev

2017-05-04 15:15:34 +00:00

package.html

…