Neil Fuller 04405925c7 resolved conflicts for merge of 71165ea6 to mnc-dev-plus-aosp ...

Change-Id: I5fb6eb3ee12318a575a5cd9faa8c8d2c98efa7bd

2015-07-17 11:49:27 +01:00

..

accessibilityservice

…

accounts

Prevent null allowableAccounts from crashing

2015-07-14 11:09:58 -04:00

animation

…

annotation

…

app

am b43b06d1: Merge "Fixed a bug where notifications were not posted on secondary users" into mnc-dev

2015-07-17 01:40:00 +00:00

appwidget

…

bluetooth

Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev

2015-07-15 01:34:43 +00:00

content

resolved conflicts for merge of 71165ea6 to mnc-dev-plus-aosp

2015-07-17 11:49:27 +01:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add USB port manager.

2015-07-15 11:34:29 -07:00

inputmethodservice

Fix "Select All" in extracted mode

2015-07-14 11:37:28 +01:00

net

am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."

2015-07-13 15:27:31 +00:00

nfc

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

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

os

am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev

2015-07-15 23:12:53 +00:00

preference

…

print

…

printservice

…

provider

Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev

2015-07-16 14:50:19 +00:00

security

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

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

service

Update ChooserTarget constructor to take ComponentName, Bundle

2015-07-16 16:29:59 -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

Log NetworkRequestInfo to get more detailed history

2015-07-14 11:46:51 +09:00

view

am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev

2015-07-10 01:44:21 +00:00

webkit

am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev

2015-07-09 17:07:24 +00:00

widget

am 353886b2: am e67416ec: am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs

2015-07-14 20:32:12 +00:00

package.html

…