Narayan Kamath 4948f0eee8 Fix build. ...

Bad automatic merge by git resulted in a dup. of a function.

Change-Id: Idb8fd8a48e1a9f6aeac98a199d6b8c661efaab16

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

Merge "Fix "blink" when going "back" quickly after entering Activity."

2014-05-01 14:13:01 +00: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 "Adds an enabled state in UserInfo instead of DevicePolicyManager"

2014-05-01 10:49:21 +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

Merge "Camera2: Update availableFormats related key docs"

2014-04-29 20:16:02 +00:00

inputmethodservice

Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT

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

net

Merge "Turn off this very verbose log."

2014-04-29 23:50:29 +00:00

nfc

Dynamic AID registration APIs for HCE.

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

os

Fix build.

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

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

security

…

service

Zen mode tweaks.

2014-04-29 21:48:26 -04:00

speech

Remove "final" from TextToSpeechClient class.

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

test

…

text

Merge "Implement better computing of battery drain time, actual charge time."

2014-04-29 18:30:08 +00:00

transition

Add mechanism for Transitions to target a class.

2014-04-29 13:08:39 -07:00

tv

Explictly release the surface in TV input framework

2014-04-30 20:05:32 +09:00

util

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

view

Add unit tests for InputMethodSubtypeSwitchingController

2014-05-01 19:13:25 +09:00

webkit

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

widget

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

package.html

…