Gabriel Peal db0dca826d resolved conflicts for merge of c1edfc2c to master ...

attempt 2

Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc

2014-03-25 13:39:55 -07:00

api

Unhide touch feedback drawable and wrapper

2014-03-24 19:54:34 -07:00

cmds

am a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"

2014-03-20 21:05:40 +00:00

core

Merge "Import translations. DO NOT MERGE"

2014-03-25 18:56:32 +00:00

data

am ed28fc89: Utilize new Android LED constants. DO NOT MERGE

2014-03-11 23:16:25 +00:00

docs

docs: Added new sensor types. Bug: 10674725

2014-03-24 15:24:43 -07:00

drm

Update DrmOutputStream to use raw FileDescriptor.

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

graphics

Merge "Fix doc build"

2014-03-25 18:08:30 +00:00

include

resolved conflicts for merge of 92860a74 to master

2014-03-10 10:57:05 +00:00

keystore

Use the correct package name for CHOOSER

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

libs

Merge "Move where updateProperties is called"

2014-03-25 17:46:18 +00:00

location

Injected settings no longer include summaries

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

media

Begin refactor of MediaFocusControl

2014-03-25 10:47:58 -07:00

native

Cleanup unnecessary includes for libskia.

2014-02-27 16:21:24 +00:00

nfc-extras

…

obex

Fixed review comments

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

opengl/java

Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""

2014-03-06 14:12:35 -08:00

packages

Merge "Import translations. DO NOT MERGE"

2014-03-25 18:56:41 +00:00

policy

Implement APIs for obtaining, caching themed Drawables

2014-03-24 18:00:26 -07:00

rs

am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"

2014-03-19 21:22:06 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."

2014-03-24 21:25:37 +00:00

telephony/java

resolved conflicts for merge of c1edfc2c to master

2014-03-25 13:39:55 -07:00

test-runner

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

tests

Fix broken tests to fix build

2014-03-19 18:42:31 -04:00

tools

Fix build.

2014-03-24 14:53:39 -07:00

wifi/java/android/net/wifi

am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

2014-03-11 17:44:20 +00:00

Android.mk

resolved conflicts for merge of 74fb97de to master

2014-03-25 11:08:19 -07:00

CleanSpec.mk

Added accessibility APIs for introspecting interactive windows.

2014-03-20 16:52:59 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove non-existent classes from preloaded-classes

2014-02-27 13:51:00 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%