Geoffrey Pitsch 3fe668a015 resolve merge conflicts of 180f4ee7f7 to master ...

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

2017-07-21 10:35:11 -04:00

..

accessibilityservice

…

accounts

Improve documentation for custome token.

2017-07-14 18:58:30 +00:00

animation

Merge "Ensure that we use SF Vsync Choreographer for the PiP transition." into oc-dev am: e1e0db8ca9

2017-06-13 01:08:25 +00:00

annotation

Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4

2017-06-06 15:48:24 +00:00

app

resolve merge conflicts of 180f4ee7f7 to master

2017-07-21 10:35:11 -04:00

appwidget

Fix crashes in AppWidgetHost when app_widgets is not supported

2017-06-23 09:54:09 -07:00

bluetooth

Make BluetoothStateChangeCallback oneway to prevent waiting on response.

2017-07-17 11:52:24 -07:00

companion

[Companion] Prevent NPE in CallbackProxy

2017-07-10 22:17:49 +00:00

content

Merge "Better translatable msgs for permission requests"

2017-07-20 14:58:53 +00:00

database

Close idle sqlite connections

2017-07-18 18:21:10 -07:00

ddm

…

debug

…

gesture

…

hardware

Merge changes from topic 'activity_view_v2'

2017-07-20 15:48:26 +00:00

inputmethodservice

…

metrics

…

net

Merge "Add unit test for IpSecService" am: 9e3f886dca am: 3182454f28 am: 345db82674

2017-07-20 08:42:27 +00:00

nfc

NFC DTA Integration

2017-07-20 22:15:39 +00:00

os

Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev am: baa85250d4

2017-07-20 14:09:07 +00:00

permissionpresenterservice

Add API to RuntimePermissionPresenter

2017-06-26 13:44:10 -07:00

preference

Fix issue for Preference.setSingleLineTitle() has no effect.

2017-06-23 13:57:15 -07:00

print

Enforce permission for print system APIs

2017-07-14 16:16:13 -07:00

printservice

Enforce permission for print system APIs

2017-07-14 16:16:13 -07:00

provider

Merge "Add provider support for metadata extraction"

2017-07-20 00:29:59 +00:00

security

Refurbish granting mechanism

2017-06-23 09:27:12 -07:00

service

Merge "Fix xml loading for managed services"

2017-07-20 17:07:29 +00:00

speech

…

text

Merge "Refactor TextUtils.join() and add documentation"

2017-07-21 08:08:31 +00:00

transition

…

util

Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe

2017-07-21 05:21:20 +00:00

view

Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev am: f62e79791b

2017-07-20 18:57:51 +00:00

webkit

WebView: remove @Nullable from SB whitelist

2017-07-18 16:32:19 -07:00

widget

Merge "Update TextView ApiDoc for lineSpacing attributes"

2017-07-20 15:26:51 +00:00

package.html

…