Nick Kralevich 82b3201a95 resolved conflicts for merge of 13ed83ee to master ...

Change-Id: Ia3739cfa7af60e6a47bf94d403df190f3f2cd082

2014-06-06 21:13:28 -07:00

api

resolved conflicts for merge of 13ed83ee to master

2014-06-06 21:13:28 -07: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 13ed83ee to master

2014-06-06 21:13:28 -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

…

graphics

Material theme

2014-06-06 15:48:55 -07:00

include

…

keystore

…

libs

Merge changes Ie0773f85,Ie5e75505

2014-06-06 14:41:37 +00:00

location

…

media

am 1a4d3d02: Merge "TIF: Address the feedback from the API review - 2/3" into lmp-preview-dev

2014-06-06 12:36:19 +00:00

native

Remove getRequiredPermission from NDK.

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

nfc-extras

…

obex

…

opengl/java

opengl: Un-hide GLES31 and GLES31Ext classes

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

packages

Merge "Import translations. DO NOT MERGE"

2014-06-07 03:10:55 +00:00

policy

Use META_LEFT to launch the ASSIST behavior.

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

rs

am b43bc047: Merge "Change flags to use int instead of long." into lmp-preview-dev

2014-06-06 22:41:22 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 13ed83ee to master

2014-06-06 21:13:28 -07:00

telecomm/java

Fix the build breakage (update API & javadocs)

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

telephony/java

Rename PrivateApi annotation to SystemApi.

2014-06-06 15:16:27 -07:00

test-runner

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

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

tests

Material theme

2014-06-06 15:48:55 -07:00

tools

am 87590b53: Merge "Add missing abstract method override in BridgePowerManager." into lmp-preview-dev

2014-06-06 20:57:52 +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

Rename PrivateApi annotation to SystemApi.

2014-06-06 15:16:27 -07: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%