Jesse Hall 3bb7e5c909 resolve merge conflicts of 5fa7fb1d9f to master ...

Test: make
Change-Id: I7f119535a120303796fcd08f0274269f7d0dbaba

2017-01-20 17:04:48 -08:00

..

accessibilityservice

New accessibility shortcut.

2017-01-18 17:12:54 -08:00

accounts

Update Account Manager to use latest version of account discovery API.

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

animation

Add API info about Keyframe and PropertyValuesHolder am: 21b93c1f66

2016-12-09 21:30:44 +00:00

annotation

Introduce android.graphics.ColorSpace

2016-11-23 18:10:04 -08:00

app

Improve behavior of bg check.

2017-01-20 15:03:41 -08:00

appwidget

Fixing dimensions for AppWidgetProviderInfo not getting updated properly

2017-01-19 15:12:47 -08:00

bluetooth

Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794 am: 43d53395dc

2017-01-11 15:45:29 +00:00

content

Merge "Do not allow work profile apps to access main profile app."

2017-01-20 23:35:53 +00:00

database

…

ddm

…

debug

…

gesture

…

hardware

Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am: cec2ebf676 am: 8cddb920b5 am: 2146f7ef42

2017-01-19 01:36:55 +00:00

inputmethodservice

…

net

Merge "StrictMode to detect untagged network traffic."

2017-01-20 17:31:59 +00:00

nfc

…

os

resolve merge conflicts of 5fa7fb1d9f to master

2017-01-20 17:04:48 -08:00

permissionpresenterservice

…

preference

Adds data store to provide data abstracion layer for Preferences.

2016-11-29 16:15:07 +00:00

print

…

printservice

…

provider

Merge "Add ephemeral whitelist for SettingsProvider"

2017-01-20 22:06:58 +00:00

security

Add new key purpose Wrap Key to KeyProperties.java and

2017-01-19 21:02:10 -08:00

service

Add <autofill-service> that declares AutoFillService metadata.

2017-01-18 19:35:47 -08:00

speech

Merge "Remove refernces to V1 API, as V2 doesn't exist anymore."

2017-01-03 11:52:42 +00:00

text

Merge "Make selection end handle stick to selection at line end."

2017-01-13 06:39:22 +00:00

transition

Make ArcMotion material spec compliant

2017-01-05 11:43:04 +00:00

util

Merge "Add Binder support for Parcelable exceptions." am: a2ef6b5741 am: c3fbf32011 am: 4a0a4664b9

2017-01-20 23:12:19 +00:00

view

Merge "Destroy DisplayLists on time"

2017-01-20 19:45:35 +00:00

webkit

Merge "Handle multiprocess flag in WebView update service."

2017-01-18 15:19:43 +00:00

widget

Merge "Revert "Introduce set/getFontVariationSettings.""

2017-01-20 01:59:52 +00:00

package.html

…