Chris Wren 6343cb5acd resolve merge conflicts of 18455a9 to master ...

Change-Id: I06da8fa1601633baad82be50ae881462d33ff27e

2016-06-02 17:04:35 -04:00

api

Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

2016-06-02 12:41:13 +00:00

cmds

…

core

Merge "Work on issue #29042642: Watchdog going off" into nyc-dev am: 5a6cf3ac9a am: c9aaec43a6

2016-06-02 19:03:55 +00: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 setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b

2016-06-01 22:54:06 +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

…

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 "sysui: refactor for extensibility."

2016-06-02 20:49:08 +00:00

proto

resolve merge conflicts of 18455a9 to master

2016-06-02 17:04:35 -04:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Changing user switching messages for demo mode" into nyc-mr1-dev am: 5ac8499b25

2016-06-02 18:55:33 +00:00

telecomm/java

…

telephony/java

…

test-runner

…

tests

Correct valueType attribute for an AVD in test app

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

tools

…

wifi/java/android/net/wifi

WifiManager: Add new API's for backup/restore

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

Android.mk

…

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%