Jakub Pawlowski fa983ab254 resolve merge conflicts of 15658662fd to stage-aosp-master am: 3b38eaa3c2 ...

am: 208a84ecb9

Change-Id: Ic8af1a3be3c867dc3822e1374c2554be3758e52d

2017-08-09 16:19:32 +00:00

..

accessibilityservice

…

accounts

…

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

…

app

Merge "Update DexLoadReporter to comply with the new reporting API" am: 89d087886d am: 8a9e43f1bf

2017-08-08 17:27:43 +00:00

appwidget

…

bluetooth

resolve merge conflicts of 15658662fd to stage-aosp-master am: 3b38eaa3c2

2017-08-09 16:19:32 +00:00

companion

[Companion] Prevent NPE in CallbackProxy

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

content

Fix NPE when reading icon for removed session.

2017-08-02 15:36:12 +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

Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev

2017-08-08 16:01:07 +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 am: 811027ede7

2017-08-02 17:14:55 +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

…

printservice

…

provider

Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev

2017-07-21 19:00:31 +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 "Multi-user and WallpaperColors" into oc-dr1-dev

2017-08-03 22:48:27 +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

Clarifies autofill lifecycle. am: 744976e298

2017-08-08 17:42:42 +00:00

webkit

Hide APIs not intended to ship in DR.

2017-06-12 10:26:01 -06:00

widget

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

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

package.html

…