Michael Wright bab2b42445 resolve merge conflicts of 57a5cba606 to cw-e-dev. ...

Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff

2015-10-20 17:06:27 +01:00

..

accessibilityservice

…

accounts

Add get_accounts app op

2015-09-08 17:54:37 -07:00

animation

…

annotation

…

app

Merge "Retain fragment loaders" into mnc-dr-dev

2015-10-20 14:41:23 +00:00

appwidget

…

bluetooth

Implement Bluetooth settings factory reset (2/5)

2015-08-05 10:35:15 -07:00

content

am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

2015-10-16 16:25:38 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev

2015-10-20 15:31:01 +00:00

inputmethodservice

Fix: Wrong suggestion popup position in extract mode.

2015-07-17 16:36:57 -07:00

net

am a03ecf7d: Merge "Push firewall rules up to ConnectivityService." into mnc-dr-dev

2015-10-12 16:39:34 +00:00

nfc

Fix missing copyright headers.

2015-09-07 11:53:59 +02:00

os

am 0c15693e: Merge "Update docs to reflect adoptable behavior." into mnc-dr-dev

2015-10-16 16:25:38 +00:00

preference

Update volume slider on device changed.

2015-10-14 16:13:28 -04:00

print

…

printservice

…

provider

am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev

2015-09-30 20:11:22 +00:00

security

Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.

2015-07-16 16:52:51 -07:00

service

Add 'until next alarm' option to QS zen panel.

2015-10-15 17:02:00 -04:00

speech

NPE occured when trying to parcel voice features.

2015-08-05 15:48:26 +01:00

test

…

text

Fix line height problem with inline images in StaticLayout.

2015-10-16 02:49:13 -07:00

transition

Fix Fade out during Activity Transition.

2015-07-06 10:23:13 -07:00

util

Fix issue #23122445: Add 420 density

2015-08-11 17:18:53 -07:00

view

am be655510: Merge "Disassociate system windows from apps" into mnc-dr-dev

2015-10-16 16:18:45 +00:00

webkit

Close ZipFiles correctly in WebViewFactory.

2015-08-10 16:40:50 +01:00

widget

Adds an option to override RemoteViews transition.

2015-09-25 13:10:52 -04:00

package.html

…