Colin Cross c955677c1b fix build ...

When commit 4e48f40b03 merged from
AOSP it added a hunk that was already present.  Remove the second
copy.

Change-Id: I48b30fd5fe21d6668cc904744fed7d5044fae91d

2014-04-24 22:45:05 -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

Merge "Enabling doc centric recents on phones."

2014-04-24 23:24:40 +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

Add support for muliple active development codenames.

2014-04-24 16:18:43 -07:00

database

…

ddm

…

debug

…

emoji

…

gesture

…

hardware

Camera2 API: fix bug in Camera2 CTS test failure.

2014-04-18 17:35:00 -07:00

inputmethodservice

Allow IMEs to start/stop receiving onUpdateCursor callback

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

net

API tweaks for network score settings.

2014-04-24 09:33:27 -07:00

nfc

Dynamic AID registration APIs for HCE.

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

os

Merge "Send factory reset notification broadcasts at foreground priority"

2014-04-25 00:26:05 +00: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

Add directory selection to DocumentsProvider.

2014-04-22 22:18:21 -07:00

security

…

service

Do not disturb: persist user config.

2014-04-22 11:01:24 -04:00

speech

Remove "final" from TextToSpeechClient class.

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

test

…

text

am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev

2014-04-24 16:25:21 +00:00

transition

Properly filter out excluded views in createAnimators() call.

2014-04-22 16:21:23 -07:00

tv

Add overlay view in Tv Input Framework

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

util

Tune down the linkify false positive rate

2014-04-23 11:17:20 -07:00

view

Merge "Add floats-only drawRoundRect to Canvas"

2014-04-24 21:56:41 +00:00

webkit

fix build

2014-04-24 22:45:05 -07:00

widget

Nested scrolling!

2014-04-24 10:48:52 -07:00

package.html

…