Jakub Pawlowski 208a84ecb9 resolve merge conflicts of 15658662fd to stage-aosp-master ...

am: 3b38eaa3c2

Change-Id: Ie87c58c7a0a93ab398c3f5eac6e13be837f4ed58

2017-08-09 16:06:47 +00: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 "Update DexLoadReporter to comply with the new reporting API" am: 89d087886d

2017-08-08 17:21:10 +00:00

appwidget

Annotate @SystemApi with required permissions.

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

bluetooth

resolve merge conflicts of 15658662fd to stage-aosp-master

2017-08-09 13:03:35 +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

Report permission flags for all protections based on SDK

2017-07-28 16:42:09 +00:00

database

Merge "Revert "Fix ContentObserver unregister issue""

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

ddm

…

debug

…

gesture

…

hardware

Merge "camera2: Fix template requirements" into oc-dev

2017-08-02 19:56:55 +00:00

inputmethodservice

…

metrics

…

net

Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240

2017-08-05 01:01:04 +00:00

nfc

Merge "Set default value for T3T_PMM."

2017-08-01 20:40:33 +00:00

os

Merge "Add hwbinder library" am: 49e2a9a612

2017-08-02 17:05:56 +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 "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev

2017-07-19 04:44:53 +00:00

security

Merge "Add owners for the network security config"

2017-08-02 17:20:16 +00:00

service

Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev

2017-08-02 15:52:05 +00:00

speech

…

text

Remove redundant TextClassificationService

2017-05-09 13:51:03 +01:00

transition

…

util

Merge "add links to Log class summary for methods and logcat doc" into oc-dev

2017-06-29 16:19:25 +00:00

view

Clarifies autofill lifecycle.

2017-08-07 17:22:50 -07: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

…