Neil Fuller 1913dc11b1 resolved conflicts for merge of 71165ea6 to mnc-dr-dev-plus-aosp ...

Change-Id: I21f2f14186965bdfc66ed3a2e6957d613837e138

2015-07-17 11:42:55 +01:00

..

accessibilityservice

…

accounts

Prevent null allowableAccounts from crashing

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

animation

…

annotation

…

app

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

2015-07-17 02:24:41 +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-dr-dev-plus-aosp

2015-07-17 11:42:55 +01:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 76c4c666: Add USB port manager.

2015-07-15 22:26:38 +00: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:26:09 +00:00

nfc

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

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

os

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

2015-07-16 00:05:12 +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

…

service

Update ChooserTarget constructor to take ComponentName, Bundle

2015-07-16 16:29:59 -07:00

speech

…

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 773f1b2f: am 26fa501d: DO NOT MERGE: Introduce stem keycodes for Wear

2015-07-15 21:08:39 +00:00

webkit

am 64a57dc1: am 4204ed96: am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev

2015-07-09 17:59:37 +00:00

widget

am edf1f874: am f7810b44: am 90adb81b: 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 21:04:43 +00:00

package.html

…