Ian Pedowitz d7be214ca4 resolved conflicts for merge of 8cee6587 to mnc-dr-dev ...

Change-Id: I0b2ed52214bb097d7fd69434afd0c6c890b5afb3

2015-07-13 22:58:29 -07:00

..

accessibilityservice

…

accounts

Revert "Revert "Security: AccountChooser shouldn't auto reveal accounts.""

2015-07-10 14:47:07 -07:00

animation

DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes

2015-06-10 22:54:09 +00:00

annotation

…

app

Merge "Improve alarm manager docs." into mnc-dev

2015-07-10 01:19:49 +00:00

appwidget

AppWidgetServiceImpl should use ParceledListSlice as return object

2015-06-17 15:23:31 -07:00

bluetooth

Do not return devices when caller has no location permission

2015-07-09 21:38:50 +00:00

content

Merge "Teach storage appops." into mnc-dev

2015-07-14 01:24:37 +00:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev

2015-07-13 18:21:37 +00:00

inputmethodservice

Handle back key to cancel text action mode in full-screen IME.

2015-06-24 00:20:24 -07:00

net

Merge "Legacy VPN calls to require a userID" into mnc-dev

2015-07-10 19:05:38 +00:00

nfc

Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev

2015-07-02 12:28:46 +00:00

os

resolved conflicts for merge of 8cee6587 to mnc-dr-dev

2015-07-13 22:58:29 -07:00

preference

Volume: Disable seekbar prefs when zen muted.

2015-06-10 19:04:40 -04:00

print

…

printservice

Propagete document meta-data to custom print UI.

2015-06-11 03:32:09 -07:00

provider

Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission

2015-07-12 22:41:00 +01:00

security

Merge "Use standard copyright banner in android/security/keymaster." into mnc-dev

2015-06-25 15:07:28 +00:00

service

Fix issue #22328792: Fix scalability issues in AssistStructure

2015-07-09 14:06:47 -07:00

speech

Fix crash with engines that don't override getVoices().

2015-06-26 16:25:37 +01:00

test

…

text

Merge "Improve Html.toHtml() documentation" into mnc-dev

2015-07-11 06:09:12 +00:00

transition

Fix Fade out during Activity Transition.

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

util

Better handling of trim/benchmark results.

2015-07-01 15:48:34 -07:00

view

Merge "Fix black keyguard / missing status bar" into mnc-dev

2015-07-10 00:01:20 +00:00

webkit

Enhance documentation of WebSettings.WebSettings method

2015-07-07 13:39:48 -07:00

widget

Merge "Remove personal/device group from sideloading screen." into mnc-dev

2015-07-13 17:34:20 +00:00

package.html

…