Marie Janssen 6727859f42 resolve merge conflicts of 825d8ff to master ...

Change-Id: I57ae47778f738dbea6a670b85f24161cfb544a16

2016-12-29 16:20:43 -08:00

apct-tests/perftests

CriticalNative for RenderNode and DisplayListCanvas

2016-12-15 11:30:08 -08:00

api

New AudioAttributes usage for "assistant" use case

2016-12-29 12:09:15 -08:00

cmds

media volume: remove old --set and rename --index to --set

2016-12-22 00:18:50 +00:00

core

resolve merge conflicts of 825d8ff to master

2016-12-29 16:20:43 -08:00

data

Add font descriptions for six more scripts to fonts.xml

2016-12-19 15:19:35 -08:00

docs

docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4 am: bd7fab30dc

2016-12-19 18:24:10 +00:00

drm

…

graphics

Merge "Throw exception if getPixel(s) is called on a hardware bitmap"

2016-12-20 18:56:31 +00:00

keystore

Test for null context in getPrivateKey

2016-11-16 06:06:36 -07:00

legacy-test

Copy core-junit files into legacy-test.

2016-12-14 14:19:08 +00:00

libs

Merge "Support Bitmap.copy for hardware bitmaps"

2016-12-19 18:41:21 +00:00

location

Move dump() to dumpAsync(), more oneway calls.

2016-12-02 15:17:20 -08:00

media

New AudioAttributes usage for "assistant" use case

2016-12-29 12:09:15 -08:00

native

…

nfc-extras

…

obex

…

opengl/java

Guarantee that glMapBufferRange/glGetBufferPointv return a ByteBuffer

2016-11-30 17:14:57 -08:00

packages

Merge "Disallow entering PiP without dismissing keyguard."

2016-12-29 20:29:45 +00:00

proto

DO NOT MERGE Revert "Add Brightness setting for VR Mode."

2016-12-27 18:28:40 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of 825d8ff to master

2016-12-29 16:20:43 -08:00

telecomm/java

Add reason code used to tell dialer when call failed due to WFC being off. am: 6adbd2bf5f

2016-12-12 17:26:07 +00:00

telephony/java

Merge "Add VisualVoicemailService"

2016-12-28 00:33:17 +00:00

test-runner

Make sure ServiceConnection callback is called in main thread

2016-12-29 14:07:46 +00:00

tests

DO NOT MERGE Stricter NetworkNotificationManagerTest

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

tools

Merge "AAPT2: Treat non-AAPT attributes as Attributes with no format specified."

2016-12-28 19:29:22 +00:00

wifi

Revert "DO NOT MERGE: Add API to indicate carrier networks."

2016-12-22 13:16:53 -08:00

Android.bp

Fix vulnerability in MemoryIntArray

2016-12-07 22:43:56 +00:00

Android.mk

Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499 am: 91ab2e2f98

2016-12-29 20:08:38 +00:00

CleanSpec.mk

Rename MountService to StorageManagerService.

2016-11-15 12:43:37 -08:00

compiled-classes-phone

Rename MountService to StorageManagerService.

2016-11-15 12:43:37 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Move ContextHubService to a better location.

2016-12-21 11:33:28 -08:00

PREUPLOAD.cfg

Point to the new checkstyle location for frameworks/base PREUPLOAD hook.

2016-12-15 15:01:36 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%