Ben Murdoch f564c7fe86 resolved conflicts for merge of ecf09321 to master ...

Change-Id: I7a440204dfc79f3b82bd95d3d1276158bf3d44a2

2014-05-20 19:13:39 +01:00

..

accessibilityservice

…

accounts

…

alsa

Changed namespace of AlsaParser (and components) to correctly reflect their place

2014-05-15 13:22:37 -07:00

animation

API Review: split out BidirectionalTypeConverter.

2014-05-19 15:57:14 -07:00

annotation

…

app

resolved conflicts for merge of b3ce4b1b to master

2014-05-20 09:35:36 -07:00

appwidget

Exposing the API to support widgets in Recents.

2014-05-05 14:33:44 -07:00

bluetooth

Remove a hide tag link.

2014-05-20 02:43:02 -07:00

content

resolved conflicts for merge of ecf09321 to master

2014-05-20 19:13:39 +01:00

database

am b4606676: am 49538def: am 79e0206e: Merge "Init the static member when first used for CursorWindow."

2014-05-16 12:34:48 +00:00

ddm

am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS."

2014-04-28 20:03:38 +00:00

debug

…

emoji

…

gesture

…

hardware

HdmiControlManager with HdmiPlaybackClient API definition

2014-05-19 07:46:26 +09:00

inputmethodservice

Introduce new API for floating window support

2014-05-09 19:17:15 +09:00

net

Merge "Fix reference to ProxyInfo extra"

2014-05-20 12:59:52 +00:00

nfc

HCE/SE foreground support.

2014-05-06 14:49:57 -07:00

os

Merge "Fix recording of wake_lock_in."

2014-05-16 19:42:54 +00:00

preference

VolumeZen: frameworks changes to support Settings.

2014-05-18 12:26:21 -04:00

print

PrintManager should not crash if print fueature is not available.

2014-05-08 14:25:51 -07:00

printservice

…

provider

Move the non-market install setting from Global to per-user Secure

2014-05-19 18:08:30 -07:00

security

…

service

Add ZEN and speedbump to NotificationListenerService

2014-05-20 17:03:22 +02:00

speech

TTS Connection callbacks are called on main thread.

2014-05-16 16:47:46 +01:00

test

…

text

Merge "Implement better computing of battery drain time, actual charge time."

2014-04-29 18:30:08 +00:00

transition

Allow changing order of matching Views in Transitions.

2014-05-14 12:40:06 -07:00

tv

Make mSessionCallback null in TvView.unbindTvInput

2014-05-20 14:37:01 +09:00

util

camera2: Move parameters around to different packages

2014-05-14 18:24:58 -07:00

view

Merge "Baby steps"

2014-05-20 14:10:53 +00:00

webkit

am 4088970d: am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev

2014-05-19 11:35:04 +00:00

widget

Merge "Fix password obscuring in TextView accessibility node"

2014-05-19 23:56:06 +00:00

package.html

…