Vinod Krishnan 067351f876 resolved conflicts for merge of a3d5d3b8 to master ...

Change-Id: If0fe0cb541adb0eb74f13cf557ee264aa76c650c

2014-06-05 18:51:47 -07:00

api

Merge "Fix the build breakage (update API & javadocs)"

2014-06-06 00:50:35 +00:00

cmds

am 7ed98c43: Merge "Add an --abi argument to "pm install""

2014-06-03 13:24:45 +00:00

core

resolved conflicts for merge of a3d5d3b8 to master

2014-06-05 18:51:47 -07:00

data

am eb77dfe1: Merge "Fix broken macStyle flags on Roboto-MediumItalic" into lmp-preview-dev

2014-06-05 20:08:55 +00:00

docs

am b3b6f148: am b766edce: am 4e99af34: am aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d

2014-06-04 23:50:38 +00:00

drm

Fix a few more stray libcore.io references.

2014-04-28 20:49:24 -07:00

graphics

am 7553d48d: Merge "Fix default stroke width and NPE for line with no stroke width" into lmp-preview-dev

2014-06-05 22:22:57 +00:00

include

camera2: Plumb DngCreator to native library.

2014-05-16 23:25:51 -07:00

keystore

…

libs

am 8632b85b: Merge "Fix issues around GL on incorrect thread" into lmp-preview-dev

2014-06-05 22:22:51 +00:00

location

…

media

am b3412adf: Merge "TvContract: Add channel logo and program thumbnail" into lmp-preview-dev

2014-06-05 22:23:11 +00:00

native

am c7153377: am 73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev

2014-05-23 18:04:18 +00:00

nfc-extras

…

obex

…

opengl/java

opengl: Un-hide GLES31 and GLES31Ext classes

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

packages

am 42decb1b: Merge "API Review: move the CreateRevealAnimator to ViewAnimationUtils" into lmp-preview-dev

2014-06-05 22:39:11 +00:00

policy

Use META_LEFT to launch the ASSIST behavior.

2014-06-05 21:00:53 +00:00

rs

Add support for mixed 32/64 APKs using RenderScript.

2014-06-03 15:11:37 -07:00

samples/training/network-usage

…

sax

…

services

am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev

2014-06-06 00:16:35 +00:00

telecomm/java

Fix the build breakage (update API & javadocs)

2014-06-05 17:31:11 -07:00

telephony/java

Revert "API changes to Telephony per API review"

2014-06-05 22:55:49 +00:00

test-runner

Merge "Add ArrayUtils methods and tests for consumption by KeySet code."

2014-06-02 17:34:09 +00:00

tests

Add AnimationDrawable test

2014-06-03 14:26:29 -07:00

tools

am ee001119: Merge "LayoutLib: Add assertions for typeface." into lmp-preview-dev

2014-06-05 22:43:22 +00:00

wifi/java/android/net/wifi

Add class CellularNetwork for plmn parsing and retrieve mcc and mnc.

2014-06-03 10:10:12 -07:00

\

Doc update: new Volley class

2014-05-29 16:38:34 -07:00

Android.mk

resolved conflicts for merge of ebe661c4 to master

2014-06-03 17:06:58 +00:00

CleanSpec.mk

Put TV Input Framework under android.media.tv, including TvContract

2014-06-02 11:02:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%