Alan Viverette 22b893fde1 Merge commit '096d52fb' into manualmerge ...

Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883

2014-06-04 11:42:06 -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

Merge "Remove enableSystemApp() and enableSystemAppWithInten()."

2014-06-04 10:11:46 +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 cd5b044e: Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev

2014-06-04 18:09:14 +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

DO NOT MERGE: Added missing entries in the cec device array

2014-06-03 10:15:39 +09:00

inputmethodservice

More work on voice interaction visuals.

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

net

Fix Legacy NetworkInfo API

2014-06-03 14:00:56 +00:00

nfc

Address HCE API review comments.

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

os

am da4a186f: Merge "Some battery stats history fixes." into lmp-preview-dev

2014-06-03 17:16:01 +00:00

preference

Settings: Keep SeekBarVolumizer in sync with audio stream.

2014-06-01 13:01:23 -04:00

print

PrintManager should not crash if print fueature is not available.

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

printservice

…

provider

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

security

…

service

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

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

speech

Add missing #isSpeaking to TTS API V2

2014-06-04 09:16:55 +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

util

camera2: Move parameters around to different packages

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

view

am ef7c0948: Merge "Add an internal method for setting optical insets." into lmp-preview-dev

2014-06-03 17:15:34 +00:00

webkit

Merge "Removes bad comment from CookieManager"

2014-06-04 17:12:36 +00:00

widget

Merge commit '096d52fb' into manualmerge

2014-06-04 11:42:06 -07:00

package.html

…