Winson Chung 552bdceeaf Merge changes I20bdab1b,Id82f9081 into oc-dev ...

am: 64b044680c

Change-Id: I6bf7127bd9f46855e186e13fc4e06f27535c4916

2017-06-16 21:41:43 +00:00

apct-tests/perftests

…

api

Merge "Ensure only test print services enabled - framework" into oc-dev

2017-06-08 16:04:17 +00:00

cmds

Merge commit '06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit

2017-05-31 08:43:51 -06:00

core

Merge changes I20bdab1b,Id82f9081 into oc-dev

2017-06-16 21:41:43 +00:00

data

…

docs

…

drm

…

graphics/java/android

Merge "Better error message for AVD" into oc-dev

2017-06-07 19:31:14 +00:00

keystore

…

legacy-test

…

libs

Merge "Add a workaround for simulate secondary display" into oc-dev

2017-06-14 20:25:03 +00:00

location

Give Doclava our manifest; more permission docs.

2017-06-05 17:38:19 -06:00

media

Merge "ImageReader: Set BufferItem mGraphicBuffer to null when returning it" into oc-dev

2017-06-15 21:10:51 +00:00

native

Merge changes from topic 'multinetwork_vndk' into oc-dev

2017-05-26 01:01:21 +00:00

nfc-extras

…

obex

OBEX: Add required parameters TAG ID's for PBAP 1.2

2017-06-09 18:21:56 +00:00

opengl/java

…

packages

Import translations. DO NOT MERGE

2017-06-16 05:16:09 -07:00

proto

Merge "Revert "Instrument captive portal login activity"" am: 2921320517

2017-06-09 11:47:25 +00:00

rs

Merge "Do not CloseGuard KernelID or FieldID" am: 6b70eafae1

2017-06-13 22:18:51 +00:00

samples/training/network-usage

…

sax

…

services

Merge changes I20bdab1b,Id82f9081 into oc-dev

2017-06-16 21:41:43 +00:00

telecomm/java

Merge "Give Doclava our manifest; more permission docs." into oc-dev

2017-06-06 15:28:26 +00:00

telephony/java

Merge "Use java.util.Objects.hashCode to get hashcode." am: 3890689bb2

2017-06-15 19:44:45 +00:00

test-runner

Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40

2017-06-06 08:13:12 +00:00

tests

Merge "Fixes for tetheroffload crashes" am: 5ac7a03f9f

2017-06-16 14:10:44 +00:00

tools

Merge "DO NOT MERGE: AAPT2: Allow undefined resources (placeholders)" into oc-dev

2017-06-05 17:54:37 +00:00

vr

…

wifi

Merge "Give Doclava our manifest; more permission docs." into oc-dev

2017-06-06 15:28:26 +00:00

Android.bp

…

Android.mk

Merge "Add IApnSourceService.aidl" am: 1d5d409f6f

2017-06-09 19:04:48 +00:00

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

preloaded-classes

…

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%