Jason Monk 769139da03 resolve merge conflicts of daeafccfa9 to master ...

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

2017-05-29 11:10:28 +02:00

apct-tests/perftests

Merge "Introduce early exit path for non resource path." into oc-dev am: 01d5b3d2af

2017-05-18 23:54:24 +00:00

api

Merge "Remove the old version of setAffiliationIds" into oc-dev am: 8d902a9e28

2017-05-26 13:12:48 +00:00

cmds

Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev am: a941e29c55

2017-05-25 22:17:44 +00:00

core

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02:00

data

Merge "Declare new permission for Phone process."

2017-05-24 01:01:32 +00:00

docs

docs: Restoring file to allow staging reference docs from Gerrit

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

drm

…

graphics/java/android

Merge "Merge "Fix safezone and getAlpha b/38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am: cca181bfbb" into oc-dev-plus-aosp

2017-05-25 23:52:25 +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

don't need custom shader to track ref-counts

2017-05-26 10:01:35 -04:00

location

Fix typo in Galileo TOW flag

2017-05-11 10:06:47 -07:00

media

Merge "Playback activity monitoring: add player types" into oc-dev am: faa2cdfa47

2017-05-26 18:19:08 +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-05-20 00:27:31 +00:00

opengl/java

remove unused private field

2017-05-01 10:22:44 -04:00

packages

resolve merge conflicts of daeafccfa9 to master

2017-05-29 11:10:28 +02:00

proto

Merge "[AWARE] Metrics framework"

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

rs

Merge "Destroy Allocation with ScriptIntrinsicLut" into oc-dev

2017-05-09 17:00:25 +00:00

samples/training/network-usage

Remove unnecessary casts on calls to findViewById

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

sax

…

services

Merge "Make synthetic password enabled by default"

2017-05-26 18:28:00 +00:00

telecomm/java

Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev am: 95f4f14e0b

2017-05-25 19:55:00 +00:00

telephony/java

Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840 am: 689edc736f" into oc-dev-plus-aosp

2017-05-25 23:50:59 +00:00

test-runner

Merge "Setting Session commited broadcast when an existing apk is enabled for a different user" into oc-dev am: fc157e702f

2017-05-12 21:27:37 +00:00

tests

Merge "Support registration of offload control callbacks." am: 7ee96625c2 am: 66cc06c2c7 am: 96c6d201f4

2017-05-26 10:35:34 +00:00

tools

Merge "AAPT2: Implement attribute compat versioning" into oc-dev am: e229113d46

2017-05-26 18:55:01 +00:00

vr

Add vr platform lib

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

wifi

Merge "WifiManager: add iface name and mode labels" into oc-dev am: dfd185c62f

2017-05-26 10:01:30 +00:00

Android.bp

Convert libmedia_jni to Android.bp

2017-05-17 03:02:21 +00:00

Android.mk

Merge "Fix makefile warning." am: f523227a6e am: 9e317f8743

2017-05-23 17:25:09 +00:00

CleanSpec.mk

…

compiled-classes-phone

Update preloaded classes for O

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

preloaded-classes

Update preloaded classes for O

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

PREUPLOAD.cfg

Enable Checkstyle for "repo upload" for more projects.

2017-04-28 21:39:48 +00:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%