Christopher Lane 111db01a26 resolved conflicts for merge of 381ac080 to master ...

Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21

2014-04-14 15:14:01 -07:00

..

accessibilityservice

Adding system support for a single accessibility focus.

2014-04-11 11:21:48 -07:00

accounts

…

alsa

Implement USB Audio across Nexus Devices

2014-04-11 12:18:44 -07:00

animation

Add RevealAnimator

2014-03-27 18:30:20 -07:00

annotation

Add resource reference annotations

2014-03-27 13:07:00 -07:00

app

Actually store gravity in ActionBar.LayoutParams constructor

2014-04-14 12:59:15 -07:00

appwidget

App widget backup/restore infrastructure

2014-03-20 12:30:51 -07:00

bluetooth

am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progress" into klp-modular-dev

2014-04-10 01:07:26 +00:00

content

am 9e99cab7: am 970417c7: Added getLeanbackLaunchIntentForPackage()

2014-04-11 19:01:21 +00:00

database

…

ddm

…

debug

Remove unused JNITest class

2014-02-21 14:34:35 +00:00

emoji

…

gesture

…

hardware

am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev

2014-04-11 19:40:31 +00:00

inputmethodservice

Allow IMEs to start/stop receiving onUpdateCursor callback

2014-04-04 04:34:44 +09:00

net

resolved conflicts for merge of 381ac080 to master

2014-04-14 15:14:01 -07:00

nfc

am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field."

2014-03-06 16:21:46 +00:00

os

Merge "Expose an API to generate a badged icon for managed profiles."

2014-04-11 22:01:16 +00:00

preference

Update list item text appearance

2014-04-09 16:52:54 -07:00

print

Merge "Update print docs"

2014-03-18 18:00:01 +00:00

printservice

…

provider

Merge "Add a contract class for the TV content provider"

2014-04-14 21:31:16 +00:00

security

…

service

resolved conflicts for merge of 337e764d to master

2014-04-11 01:33:20 -07:00

speech

Remove "final" from TextToSpeechClient class.

2014-04-10 16:17:09 +00:00

test

…

text

Fix extra text appearing after ellipsis

2014-04-03 15:52:08 -07:00

transition

Add Transitions useful for Activity transitions.

2014-04-07 09:14:09 -07:00

tv

Add equals, hashCode, and toString methods in TvInputInfo.

2014-04-11 11:24:26 +09:00

util

Merge "Support for new gTLDs"

2014-03-28 23:35:10 +00:00

view

Merge "Fence on destruction"

2014-04-14 19:48:18 +00:00

webkit

Add Javadoc statement regarding enumerability of methods of injected Java

2014-04-11 10:04:18 +01:00

widget

am f6ee7e3f: am 202d1ec7: Fix text shadow attributes in textAppearance

2014-04-14 19:32:52 +00:00

package.html

…