Rom Lemarchand 7d1428d7f3 resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp. ...

Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f

2015-11-17 15:38:50 -08:00

..

accessibilityservice

…

accounts

Add get_accounts app op

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

animation

…

annotation

…

app

Merge "ActivityView gets its own thread pool." into cw-e-dev am: 1090acc958

2015-11-11 23:37:13 +00:00

appwidget

…

bluetooth

Add Bluetooth headset API to allow disabling audio route.

2015-11-16 08:55:52 -08:00

content

Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev am: a975732a83 am: 637d05eb5c

2015-10-30 21:59:36 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Camera: Documentation updates

2015-11-12 01:10:07 +00:00

inputmethodservice

Fix: Wrong suggestion popup position in extract mode.

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

net

Merge "Use duck typing in X509TrustManagerExtensions"

2015-11-12 19:33:31 +00:00

nfc

Fix missing copyright headers.

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

os

resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp.

2015-11-17 15:38:50 -08:00

preference

am cad75a26: am 627bc805: am ae5a53d7: Merge "Update volume slider on device changed." into mnc-dr-dev

2015-10-15 13:59:47 +00:00

print

…

printservice

…

provider

Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev

2015-10-22 06:18:43 +00:00

security

Add NetworkSecurityConfigProvider.install

2015-11-16 12:49:36 -08: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

Set the bounds on the drawable for ChangeBounds reparenting.

2015-10-19 23:42:38 +00:00

util

Fix issue #23122445: Add 420 density

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

view

Merge "Avoid configuration of callback being reset after relayout."

2015-11-12 16:01:22 +00:00

webkit

am e869b398: am 20272bec: am c207c943: am c5283927: Close ZipFiles correctly in WebViewFactory.

2015-08-10 16:21:56 +00:00

widget

Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 am: 6649ee972b

2015-10-22 07:49:00 +00:00

package.html

…