Jorim Jaggi 249a45363a resolve merge conflicts of c55cce487c to master ...

Change-Id: If833e3c5efed891fb1ba7b32b2edc96a60ea2566

2017-08-22 13:28:57 +02:00

..

accessibilityservice

Fix broken javadocs.

2017-08-06 07:37:08 -06:00

accounts

Fix broken javadocs.

2017-08-06 07:37:08 -06:00

animation

…

annotation

Allow marking fields with @TargetApi(XX)

2017-08-03 22:11:41 +00:00

app

resolve merge conflicts of c55cce487c to master

2017-08-22 13:28:57 +02:00

appwidget

…

bluetooth

Merge "Bluetooth: Fix startAdvertisingSet error handling" into oc-mr1-dev

2017-08-18 00:30:13 +00:00

companion

Merge "[Companion] Synchronize state access in CallbackProxy"

2017-08-18 20:56:50 +00:00

content

Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev am: 1327cdc53d

2017-08-18 21:55:35 +00:00

database

Make SQLiteDirectCursorDriver @TestApi

2017-08-08 16:55:03 -07:00

ddm

…

debug

…

gesture

…

hardware

Expose grantPermission via systemApi.

2017-08-17 08:38:00 -07:00

inputmethodservice

Fix keyboard focus in VR

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

metrics

…

net

Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev am: 21bc3a39a4

2017-08-19 01:12:35 +00:00

nfc

Merge "Set default value for T3T_PMM."

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

os

Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev am: 21bc3a39a4

2017-08-19 01:12:35 +00:00

permissionpresenterservice

…

preference

…

print

Dump print manager as proto

2017-07-25 11:32:24 -07:00

printservice

…

provider

Merge "Multi-user aware TSMS"

2017-08-14 17:52:48 +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 "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev

2017-08-15 22:23:57 +00:00

speech

TTS: Fix a race condition between enqueueSpeechItem and stopForApp.

2017-08-03 04:20:21 +00:00

text

StaticLayout capped height should be 0 when maxLines=0

2017-08-21 15:50:54 -07:00

transition

…

util

Fix email auto link when there are two chars in local part

2017-08-17 17:29:55 +00:00

view

Merge "Revert "Prohibit using recycled AccessibilityNodeInfos.""

2017-08-21 15:13:16 +00:00

webkit

Merge "Merge "Additional documentation about Autofill / WebView security." into oc-dev am: 36cbdef880 am: 7e9f379b50 am: 82e7dfcae8" into oc-mr1-dev-plus-aosp

2017-08-15 22:42:54 +00:00

widget

Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev am: 6598a4ed52

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

package.html

…