Colin Cross fae24f5aa2 Merge "Fix ManifestMerger issues" into stage-aosp-master ...

am: 669c4d7ae7

Change-Id: I54eb99fde659f6c1651ae34c49d6cd81ba198e93

2018-06-18 13:29:08 -07:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

2018-05-15 15:06:19 -07:00

api

Merge changes from topic "clean"

2018-06-13 15:33:08 -07:00

cmds

Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev

2018-06-07 14:53:43 -07:00

config

Merge "More light grey APIs." into pi-dev

2018-06-08 14:41:46 -07:00

core

Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev

2018-06-18 05:40:36 -07:00

data

Merge changes from topic "audio-package-update"

2018-06-08 17:11:41 -07:00

docs

Camera: update tonemap image in html doc

2018-06-07 10:42:39 -07:00

drm

Stop using Arrays.checkOffsetAndCount.

2018-05-16 07:11:54 -07:00

graphics/java/android

docs: repaired link to internal section

2018-06-07 13:29:41 -07:00

keystore

Improve KeyChain documentation

2018-06-04 17:12:41 +01:00

libs

resolve merge conflicts of 26119befba to pi-dev-plus-aosp

2018-06-07 20:02:59 +01:00

location

Merge "Build com.android.location.provider with java_sdk_library"

2018-06-14 21:59:40 -07:00

lowpan

Merge "Remove duplicate definitions of utility variables" am: 8d5a39ac62

2018-04-04 17:56:57 -07:00

media

Add field to set A2DP device volume on connect (1/2)

2018-06-07 22:32:24 +00:00

native

Merge "Work around b/24465209, do not pack relocation table." am: d01890df3c

2018-05-24 14:44:52 -07:00

nfc-extras

Add api txt files for nfc-extras

2018-05-12 22:36:10 +09:00

obex

Build java.obex with java_sdk_library

2018-05-30 00:19:01 +00:00

opengl/java

…

packages

Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev

2018-06-18 12:07:53 -07:00

proto

New Autofill field: FIELD_AUTOFILL_SESSION_ID

2018-05-25 06:22:25 +00:00

rs

Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev

2018-03-23 22:11:38 +00:00

samples/training/network-usage

…

sax

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-02-28 17:15:21 +00:00

services

Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev

2018-06-18 08:38:51 -07:00

telecomm

Merge "Ensure self-managed calls use voip audio mode." am: b62aa315d1

2018-06-06 16:33:19 -07:00

telephony

Merge changes from topic "clean"

2018-06-13 15:33:08 -07:00

test-base

Migrate android.test.base.stubs generation to Soong.

2018-04-13 14:55:16 -07:00

test-legacy

Build android.test.base/legacy against SDK

2018-02-18 21:47:42 +09:00

test-mock

Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." into pi-dev

2018-05-01 13:41:49 -07:00

test-runner

Merge "Convert android.test.runner.stubs to Soong" am: 6fa8d06c78

2018-05-07 18:25:56 -07:00

tests

Merge "Apf: Avoid constant overflow"

2018-06-18 01:20:28 -07:00

tools

Fix ManifestMerger issues

2018-06-15 23:03:46 +00:00

vr

Convert to Soong

2018-05-14 16:47:02 -07:00

wifi

Merge "WifiManager: add call to see if apband conversion is required" into pi-dev

2018-06-06 09:51:50 -07:00

Android.bp

Merge "Enabled annotations for Metalava based api-stubs." am: 79d3bf6e54

2018-06-18 12:37:13 -07:00

Android.mk

Merge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-dev

2018-06-08 16:33:39 -07:00

CleanSpec.mk

Merge "Build com.android.location.provider with java_sdk_library"

2018-06-14 21:59:40 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

Remove Support Library from frameworks/base pathmap.mk

2018-02-15 11:37:52 -05:00

PREUPLOAD.cfg

Add presubmit hook for hidden API lists.

2018-05-08 10:29:50 +01:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%