Nicolas Geoffray be014da638 resolve merge conflicts of 01f050f21f to oc-dev-plus-aosp ...

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

2017-04-27 13:56:20 +01:00

apct-tests/perftests

Move SystemPerfTest out of java.* namespace

2017-02-28 10:44:04 -08:00

api

Merge "setAffiliationIds and getAffiliationIds uses set instead of list" into oc-dev

2017-04-27 09:49:14 +00:00

cmds

Merge changes from topic 'virtual-display-api' into oc-dev

2017-04-24 21:33:59 +00:00

core

resolve merge conflicts of 01f050f21f to oc-dev-plus-aosp

2017-04-27 13:56:20 +01:00

data

Merge "Revert "Whitelist DMAgent from bg check"" into oc-dev

2017-04-25 18:55:08 +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

Font API clean up

2017-04-26 18:00:17 +00:00

keystore

Add device ID attestation method to keymaster

2017-04-26 17:40:44 +02:00

legacy-test

…

libs

Merge "Fix include" into oc-dev

2017-04-25 23:39:39 +00:00

location

Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council

2017-04-18 16:12:16 -07:00

media

Merge "TIF: fix javadoc of recorded programs" into oc-dev

2017-04-26 21:48:01 +00:00

native

Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle

2017-04-17 08:55:24 -07:00

nfc-extras

…

obex

…

opengl/java

Workaround apps that override surfaceCreated

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

packages

Fixing issue with lingering dismiss PiP overlay.

2017-04-27 00:49:33 +00:00

proto

Merge "Wifi Metrics STA event list" into oc-dev

2017-04-24 17:57:32 +00:00

rs

Validates Intrinsic Blur only takes 2D Allocations

2017-04-20 15:32:37 -07:00

samples/training/network-usage

Remove unnecessary casts on calls to findViewById

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

sax

…

services

resolve merge conflicts of 01f050f21f to oc-dev-plus-aosp

2017-04-27 13:56:20 +01:00

telecomm/java

Merge "Remove default public ctor from RttModifyStatus" into oc-dev

2017-04-26 20:04:32 +00:00

telephony/java

Merge "Extend carrier configs for visual voicemail"

2017-04-26 16:51:22 +00:00

test-runner

Merge "Address API review comments for registerReceiver" into oc-dev

2017-04-20 19:52:51 +00:00

tests

Merge "NsdService: bootstrap unit tests" am: 7ca060aa95 am: dd53c962b2

2017-04-27 05:49:47 +00:00

tools

Merge "Update fontchain to read from additional sequences" into oc-dev

2017-04-25 17:48:29 +00:00

wifi

Merge "WifiManager: add updateInterfaceIpState" am: 2dbd137795 am: 6f69ea87e7

2017-04-26 21:13:34 +00:00

Android.bp

…

Android.mk

Merge changes I8f5a756a,I2bac468f,I043dfefa,I2c55f96e into oc-dev

2017-04-26 08:16:53 +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

Reorganize font enumeration API.

2017-04-03 13:55:07 -07: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

Reorganize font enumeration API.

2017-04-03 13:55:07 -07:00

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%