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

api

Merge "camera2: Add DNG creator class."

2014-04-25 01:10:08 +00:00

cmds

am 56cc5ba7: am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion."

2014-04-24 15:43:24 +00:00

core

fix build

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

data

Add Fire TV remote key layout.

2014-04-18 14:24:12 -07:00

docs

am 9a4db311: am 3cb4430b: am 27547e6d: am fdc9e56f: Correcting name of \'Backup & reset\' menu.

2014-04-24 23:48:57 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00

graphics

Add floats-only drawRoundRect to Canvas

2014-04-24 14:23:52 -07:00

include

am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

2014-04-09 14:06:10 +00:00

keystore

Use the correct package name for CHOOSER

2014-03-17 16:21:56 -07:00

libs

Merge "Shoot the rays to the vertices of the incoming polygon."

2014-04-24 18:03:00 +00:00

location

Injected settings no longer include summaries

2014-03-03 10:30:36 -08:00

media

Merge "camera2: Add DNG creator class."

2014-04-25 01:10:08 +00:00

native

Bug fix for wakeup sensors.

2014-04-23 17:05:41 -07:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

2014-04-21 19:49:40 +00:00

packages

resolved conflicts for merge of 02e85744 to master

2014-04-24 17:18:10 -07:00

policy

resolved conflicts for merge of d90712d0 to master

2014-04-22 11:05:15 -07:00

rs

am fc45b664: am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."

2014-04-17 23:33:54 +00:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

am e5889679: am 3a656ea3: Merge "Too soon." into klp-modular-dev

2014-04-25 03:10:13 +00:00

telephony/java

Start collecting mobile radio activity from the radio.

2014-04-24 11:21:30 -07:00

test-runner

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

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

tests

Merge "Format the xml files for the VectorDrawableTest"

2014-04-24 22:17:02 +00:00

tools

am 7406e4b8: am 7947ec71: am b64732d9: Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev

2014-04-24 01:36:22 +00:00

wifi/java/android/net/wifi

am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev

2014-04-17 21:57:12 +00:00

Android.mk

Initial implementation of NetworkScoreManager's backing service.

2014-04-21 16:04:05 -07:00

CleanSpec.mk

Add cleanspec for media Session apis.

2014-04-18 14:48:24 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove VideoEditor

2014-04-21 16:11:51 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%