Jason Monk db8870065a resolve merge conflicts of 8c1e6e49f9 to oc-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: If41b96601018976c8f5a5ea8d124bc0abb4ef605

2017-06-15 13:41:14 -04:00

apct-tests/perftests

Introduce early exit path for non resource path.

2017-05-16 10:14:56 -07:00

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 "Add a workaround for simulate secondary display" into oc-dev

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

data

Merge "Adding 'uhid' permission for bluetooth stack." am: 3e010d1353 am: 96d3b668bb

2017-05-12 01:00:34 +00:00

docs

docs: Restoring file to allow staging reference docs from Gerrit

2017-04-18 14:00:55 -07:00

drm

Clarify release/close java docs

2017-03-15 21:46:42 -07:00

graphics/java/android

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

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

keystore

Merge "Implement CACert queries in SecurityController" into oc-dev

2017-05-10 15:22:07 +00:00

legacy-test

Moved c.a.i.u.Predicate[s] into legacy-test

2017-05-12 15:35:11 +01:00

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 "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev

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

native

Merge changes from topic 'multinetwork_vndk' into oc-dev

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

nfc-extras

Fixed nfc-extras build files

2017-05-23 11:51:15 +01:00

obex

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

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

opengl/java

Workaround apps that override surfaceCreated

2017-04-21 17:14:45 -07:00

packages

resolve merge conflicts of 8c1e6e49f9 to oc-dev-plus-aosp

2017-06-15 13:41:14 -04: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

Remove unnecessary casts on calls to findViewById

2017-04-14 11:15:50 -04:00

sax

Prepare for removal of legacy-test from default targets

2017-01-18 16:39:34 +00:00

services

Merge "add a log for peek to shade expansion" into oc-dev

2017-06-15 16:28:27 +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 "Adds error codes and maximum RAN/Bands/Channels" am: 70373f7928

2017-06-14 02:33:41 +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

Fix dependencies of packages that target earlier releases

2017-06-15 09:10:13 +01:00

tools

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

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

vr

Add vr platform lib

2017-05-10 16:54:20 -07:00

wifi

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

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

Android.bp

Convert libmedia_jni to Android.bp

2017-05-16 22:05:39 -07:00

Android.mk

Merge "Add IApnSourceService.aidl" am: 1d5d409f6f

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

CleanSpec.mk

Clean spec to deal with rename of auto_fill to autofill

2017-03-10 13:02:43 -08:00

compiled-classes-phone

Update preloaded classes for O

2017-05-25 01:03:26 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

Move framework-specific portions of pathmap.mk into frameworks/base

2017-03-03 16:18:32 +00:00

preloaded-classes

Update preloaded classes for O

2017-05-25 01:03:26 +00: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%