Elliott Hughes 10596fbcce resolved conflicts for merge of 3ce4f3d0 to master ...

Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210

2014-04-28 13:53:25 -07:00

..

accessibilityservice

Adding system support for a single accessibility focus.

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

accounts

am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to launch arbitrary activities.

2014-02-27 11:24:05 -08:00

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

resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 13:53:25 -07:00

appwidget

App widget backup/restore infrastructure

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

bluetooth

DO NOT MERGE Tear down PAN if we can't successfully complete a DHCP request

2014-04-21 14:26:56 -04:00

content

Merge "Handle density request in LauncherActivityInfo"

2014-04-25 23:04:27 +00:00

database

am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev

2014-01-28 00:13:27 +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

Remove unused JNITest class

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

emoji

Use long for pointers in EmojiFactory and PdfDocument

2014-01-31 12:03:28 +00:00

gesture

…

hardware

Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.

2014-04-25 11:39:16 -07:00

inputmethodservice

Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT

2014-04-29 05:01:08 +09:00

net

resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 13:53:25 -07:00

nfc

Dynamic AID registration APIs for HCE.

2014-04-23 20:21:32 +00:00

os

resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 13:53:25 -07:00

preference

Improve Preference highlighting

2014-04-17 19:42:05 -07:00

print

Merge "Update print docs"

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

printservice

…

provider

resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 13:53:25 -07:00

security

…

service

Rework some of the voice interaction APIs.

2014-04-28 10:54:15 -07:00

speech

Remove "final" from TextToSpeechClient class.

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

test

…

text

am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev

2014-04-25 17:38:00 +00:00

transition

Merge "Fade Transition sometimes disappeared improperly."

2014-04-28 17:23:53 +00:00

tv

Add overlay view in Tv Input Framework

2014-04-18 08:36:06 -07:00

util

am a19b9c41: am dfdeabf9: am ac732708: Merge "EventLog: event log translation errors"

2014-04-25 22:52:09 +00:00

view

Merge "Return the cursor position in screen coordinates"

2014-04-28 19:17:05 +00:00

webkit

Clarify a use case.

2014-04-25 09:39:31 -07:00

widget

Quantum ripple for ListView selector

2014-04-27 18:13:34 -07:00

package.html

…