Griff Hazen d445fe7e54 resolved conflicts for merge of cbe69ec1 to master ...

Change-Id: I183f94c726c9acb3de7d9369e315cc4ae1ff92d6

2014-05-20 16:53:09 -07: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 cbe69ec1 to master

2014-05-20 16:53:09 -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

Merge "Various API review fixes to resources and drawables"

2014-05-20 22:06:12 +00: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

Merge "USB: Minor cleanup from API council review"

2014-05-20 18:58:35 +00:00

inputmethodservice

Introduce new API for floating window support

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

net

Move IP config from WifiConfiguration to IpConfiguration.

2014-05-20 15:24:10 -07:00

nfc

HCE/SE foreground support.

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

os

Per-user telephony restrictions

2014-05-20 15:13:28 -07: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

Merge "Update FingerprintManager API after discussions."

2014-05-20 23:18:48 +00:00

speech

TTS Connection callbacks are called on main thread.

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

test

…

text

am 9777fdb7: am b0a7f84b: am 63bf04d8: Merge "Fix NullException in QwertyKeyListener.KeyDown"

2014-05-20 20:47:29 +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 "Clean up Outline API, method on drawable"

2014-05-20 23:27:21 +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

…