Jeff Sharkey a0d2e12fe0 resolve merge conflicts of 0c26c32 to master ...

Change-Id: I2398a72d7a3575743e5948bc16b1b8582ccf106b

2016-06-03 15:00:10 -06:00

api

resolve merge conflicts of 0c26c32 to master

2016-06-03 15:00:10 -06:00

cmds

Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7

2016-05-24 21:41:32 +00:00

core

resolve merge conflicts of 0c26c32 to master

2016-06-03 15:00:10 -06:00

data

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a

2016-06-01 23:02:47 +00:00

docs

Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am: 0b8eb8c1e8

2016-06-03 02:59:57 +00:00

drm

…

graphics

Merge "Fix the instrumentation report issue"

2016-06-02 16:24:05 +00:00

include

…

keystore

…

libs

Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f am: e136aba4ad

2016-06-02 01:58:15 +00:00

location

Adding SBAS offset to Gps/Gnss SvStatus converter

2016-05-24 09:25:02 -07:00

media

media: fix issues with video profile levels am: 2fc9c6925a am: 9e56ec51b0

2016-06-02 04:10:07 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

2016-06-03 19:25:21 +00:00

proto

leave more space for mr1 constants

2016-06-02 17:08:21 -04:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev am: 37087ad710

2016-06-03 15:44:53 +00:00

telecomm/java

Merge "Remove PROPERTY_WORK_CALL" into nyc-dev

2016-05-23 17:26:45 +00:00

telephony/java

Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev

2016-06-03 16:44:29 +00:00

test-runner

Un-deprecated Android mock testing APIs

2016-05-25 22:54:27 +00:00

tests

Correct valueType attribute for an AVD in test app

2016-06-01 13:38:03 -07:00

tools

Merge "Allow uses-library under <application>" into nyc-mr1-dev am: c878fb0cb8

2016-06-03 00:44:51 +00:00

wifi/java/android/net/wifi

WifiManager: Add new API's for backup/restore

2016-05-31 13:36:38 -07:00

Android.mk

Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev am: 6a5c9560a3

2016-06-03 16:50:13 +00:00

CleanSpec.mk

…

compiled-classes-phone

…

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%