Nicolas Geoffray 8dbb5e51c8 resolve merge conflicts of e017dae587 to stage-aosp-master ...

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

2017-09-13 11:08:36 +01:00

..

accessibilityservice

…

accounts

…

animation

…

annotation

…

app

Merge changes I7218f17a,I96b7340a

2017-08-31 21:44:25 +00:00

appwidget

…

bluetooth

Merge "Update ScanSettings documentation for scan modes"

2017-09-08 19:58:33 +00:00

companion

[Companion] Prevent NPE in CallbackProxy

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

content

Merge "Optionally append managed service approvals" into oc-dr1-dev

2017-08-17 00:54:37 +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

Fix keyboard focus in VR

2017-08-02 10:46:22 -07:00

metrics

…

net

NetworkStats: more robust subtraction for deltas

2017-09-08 13:39:44 +09:00

nfc

Merge "Set default value for T3T_PMM."

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

os

resolve merge conflicts of e017dae587 to stage-aosp-master

2017-09-13 11:08:36 +01: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

…

printservice

…

provider

Merge "Ensure the generation is not changed before put value to cache"

2017-08-28 19:58:06 +00:00

security

Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a

2017-08-02 17:41:21 +00:00

service

Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880

2017-08-15 21:42:40 +00:00

speech

…

text

…

transition

…

util

Handle an edge case that can reset settings provider data

2017-07-20 13:50:23 -07:00

view

Merge "docs: replaced "i.e." to fix formatting error" into oc-dev

2017-08-11 21:01:15 +00:00

webkit

Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880

2017-08-15 21:42:40 +00:00

widget

Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev

2017-07-28 21:46:43 +00:00

package.html

…