Elliott Hughes f8abeb8457 resolved conflicts for merge of 04c987a8 to master ...

Change-Id: I27912e203e4d4e39aef6ffbb58b0934a2796ddfe

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

am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev

2014-05-31 00:00:05 +00:00

appwidget

Widget restore documentation tweaks

2014-05-28 17:56:53 -07:00

bluetooth

am 19bdd64c: Merge "Address API review comments. 1. Moved le stuff to it\'s subpackage. Remove BluetoothLe for all classes except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings. 2. Make all callbacks abstract classes instead of interfaces. 3. Moved Advertis

2014-05-30 21:38:59 +00:00

content

am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev

2014-05-30 23:51:46 +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

Report runtime information to DDMS

2014-05-28 09:13:45 +02:00

debug

…

emoji

…

gesture

…

hardware

am 7ebaa1ef: Merge "Camera2: update the range of metering weight" into lmp-preview-dev

2014-05-30 21:43:55 +00:00

inputmethodservice

More work on voice interaction visuals.

2014-05-30 10:06:16 -07:00

net

Adjust Network's SocketFactory to restrict host name resolution to that Network

2014-05-29 19:17:06 +00:00

nfc

Address HCE API review comments.

2014-05-29 21:10:01 +00:00

os

am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev

2014-05-30 23:51:46 +00:00

preference

frameworks/base: Performance tweaks for SeekBarVolumizer.

2014-05-27 13:10:38 -04:00

print

PrintManager should not crash if print fueature is not available.

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

printservice

…

provider

Add support for wake gestures.

2014-05-29 15:22:40 -07:00

security

…

service

Merge "Clean up voice API." into lmp-preview-dev

2014-05-30 23:54:11 +00:00

speech

Markup support for framework

2014-05-30 13:48:09 +00:00

test

…

text

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

2014-05-20 20:47:29 +00:00

transition

Fix for quick "back" in Activity Transitions.

2014-05-20 15:36:31 -07:00

tv

Fix a typo

2014-05-28 16:34:21 +09:00

util

camera2: Move parameters around to different packages

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

view

am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev

2014-05-31 01:56:15 +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

resolved conflicts for merge of 04c987a8 to master

2014-05-30 20:13:15 -07:00

package.html

…