Hugo Benichi a428392c1d resolve merge conflicts of 4f2a0fe213 to stage-aosp-master ...

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

2017-07-14 07:25:51 +09:00

..

accessibilityservice

…

accounts

Merge "Fix visibility issue in AccountManager.getAuthTokenByFeatures." into oc-dev

2017-06-06 18:30:12 +00:00

animation

Ensure that we use SF Vsync Choreographer for the PiP transition.

2017-06-12 10:08:58 -07:00

annotation

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

app

Merge "Add dumpsys support to RulesManagerService"

2017-07-03 09:41:47 +00:00

appwidget

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

bluetooth

Merge "GATT: Expose opportunistic client API to Java"

2017-07-11 20:23:53 +00:00

companion

Merge "[Companion] Fix notification access dialog being in new task" into oc-dev

2017-06-20 22:23:05 +00:00

content

Merge "Stop loading other package's font by default." into oc-dev

2017-06-23 04:23:44 +00:00

database

Merge "Revert "Fix ContentObserver unregister issue""

2017-07-13 03:49:36 +00:00

ddm

…

debug

…

gesture

…

hardware

Merge "Camera2: Cache method list in MethodNameInvoker." into oc-dev

2017-06-12 20:49:49 +00:00

inputmethodservice

…

metrics

…

net

resolve merge conflicts of 4f2a0fe213 to stage-aosp-master

2017-07-14 07:25:51 +09:00

nfc

Merge changes from topic 'NCI-2.0'

2017-07-06 22:48:20 +00:00

os

Merge "Add configureRpcThreadpool to java interface"

2017-07-13 19:21:42 +00:00

permissionpresenterservice

…

preference

…

print

Ensure only test print services enabled - framework

2017-06-07 18:50:05 -07:00

printservice

Ensure only test print services enabled - framework

2017-06-07 18:50:05 -07:00

provider

Merge "Address further API review comments"

2017-07-12 15:52:20 +00:00

security

…

service

Improved documentation for AutofillService package:

2017-06-22 15:25:31 -07:00

speech

…

text

…

transition

…

util

Merge changes I4b58610f,Ib758756a into oc-dev

2017-05-31 01:14:54 +00:00

view

Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev

2017-06-21 01:47:58 +00:00

webkit

Moar Autofill Framework javadoc improvements:

2017-05-25 16:10:08 -07:00

widget

Stop loading other package's font by default.

2017-06-22 19:07:17 -07:00

package.html

…