Michael Kolb 7119c07192 resolved conflicts for merge of 1e6706ab to master ...

Change-Id: Ia8e8fdf5e13acca496bf7ff9916c9950d5b13e4e

2014-06-09 15:35:59 -07:00

api

am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev

2014-06-09 19:29:28 +00:00

cmds

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

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

core

Merge "Add @SystemApi annotation to internal permissions."

2014-06-09 21:05:43 +00: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

Material theme

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

include

camera2: Plumb DngCreator to native library.

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

keystore

Use the correct package name for CHOOSER

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

libs

Merge changes Ie0773f85,Ie5e75505

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

location

Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.

2014-04-25 11:39:16 -07:00

media

am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev

2014-06-09 19:29:58 +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

am 576563c3: Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev

2014-06-09 19:29:23 +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 1e6706ab to master

2014-06-09 15:35:59 -07:00

telecomm/java

API: Add call service handoff trigger

2014-06-06 11:27:43 -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

Merge "Add support for @SystemApi annotation to aapt."

2014-06-09 21:05:17 +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

am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev

2014-06-09 19:29: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

Remove VideoEditor

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

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%