Jakub Pawlowski 5aa4ba3776 resolve merge conflicts of 5671277 to stage-aosp-master ...

Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac

2016-08-11 15:53:06 -07:00

..

accessibilityservice

Reduce cost of a11y services with magnification.

2016-05-09 16:21:29 -07:00

accounts

…

animation

Fix setCurrentPlayTime for started but not yet pulsed animations

2016-06-13 17:29:03 +00:00

annotation

…

app

Stop profiling on uncaught exception.

2016-08-02 17:32:39 +01:00

appwidget

Set accessibility string for suspended widgets.

2016-05-23 19:35:59 +01:00

bluetooth

resolve merge conflicts of 5671277 to stage-aosp-master

2016-08-11 15:53:06 -07:00

content

Merge \"Fix the API compatibility of \"UriMatcher#addURI\"\"

2016-08-01 17:43:30 +00:00

database

Fix documentation bug in SQLiteDatabase

2016-05-12 16:53:10 -07:00

ddm

…

debug

…

gesture

…

hardware

Sensor: Make getId() more varied

2016-06-22 13:28:29 -07:00

inputmethodservice

Make IMS#clearInsetOfPreviousIme() reliable.

2016-05-15 20:05:56 -07:00

net

Merge \"Changes for upgrade to OkHttp 2.7.5\"

2016-06-30 12:49:47 +00:00

nfc

Merge "Adddress NFC API review comments." into nyc-dev

2016-05-17 18:33:09 +00:00

os

Mark app pending intents in notification extras

2016-06-27 17:32:25 -07:00

permissionpresenterservice

…

preference

…

print

…

printservice

…

provider

Merge \"Fix a race in local settings caches\" into nyc-dev

2016-06-18 00:38:28 +00:00

security

Merge "Add stub isCTVerificationRequired methods"

2016-08-09 19:43:50 +00:00

service

Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev

2016-06-23 21:00:19 +00:00

speech

…

test

…

text

Fix int overflow in SpannableStringBuilder.replace

2016-06-03 18:11:45 -07:00

transition

…

util

Merge "Add a finalize() method to StrictJarFile"

2016-08-09 10:49:58 +00:00

view

Merge \"Add missing null checks\" into nyc-dev

2016-06-27 17:06:22 +00:00

webkit

Use newly fetched PackageInfo for loading WebView code.

2016-06-20 14:30:27 +01:00

widget

Merge \"PopupWindow: Use DISPLAY_CLIP_VERTICAL/HORIZONTAL.\" into nyc-dev

2016-06-24 22:50:45 +00:00

package.html

…