Andrew Solovay d10e384d6c resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp ...

Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7

2018-10-04 22:50:39 +00:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

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

api

Merge "New Permission for Call Redirection service" am: 8f08ba793e

2018-10-04 13:25:39 -07:00

cmds

Merge "Handling potential SIGPIPE signals." am: 935f97ade5

2018-09-29 01:27:39 -07:00

config

Cleanup deprecated or removed telephony methods.

2018-09-24 18:02:44 +00:00

core

resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp

2018-10-04 22:50:39 +00:00

data

Merge "Added mapping files for DualShock3 and DualShock4"

2018-09-19 22:31:44 +00: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

Merge "Add @UnsupportedAppUsage annotations" am: 9137ecafbd

2018-08-30 09:10:27 -07:00

keystore

Merge "Added check for misprovisioned Pixel 2 device." into pi-dev

2018-08-24 11:21:06 -07:00

libs

Merge "Add noexcept to move constructors and assignment operators." am: 9166e89374

2018-10-01 18:37:02 -07:00

location

Merge "Add the metalava_enabled property" into pi-dev-plus-aosp

2018-10-04 05:15:01 +00:00

lowpan

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

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

media

resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp

2018-10-04 22:50:39 +00:00

native

Use multiple patterns and/or emails in per-file syntax.

2018-08-23 14:35:37 -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

Add @UnsupportedAppUsage annotations

2018-08-17 15:32:35 +01:00

packages

Merge "Add AndroidTest file for ExtServices" am: 3379469950

2018-10-04 09:10:51 -07:00

proto

Add new metrics constants for emergency dialer

2018-10-03 02:59:29 +00:00

rs

Merge "Add @UnsupportedAppUsage annotations"

2018-08-06 09:38:58 -07:00

samples/training/network-usage

…

sax

Merge "Move XML object factory logic to libcore"

2018-07-12 11:26:03 -07:00

services

resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp

2018-10-04 22:50:39 +00:00

startop

Merge "startop: Add iorapd binder integration test"

2018-10-04 17:46:47 +00:00

telecomm

Add new telecom metrics for emergency dialer

2018-10-03 02:59:42 +00:00

telephony

Merge "Clean cherry-pick 'Fix getApnTypesBitmaskFromString in ApnSetting'" am: 56dedc8fe8

2018-10-04 14:01:08 -07:00

test-base

Add the metalava_enabled property

2018-10-02 23:11:05 +09:00

test-legacy

Build android.test.* with java_sdk_library

2018-08-29 16:22:00 +09:00

test-mock

Add the metalava_enabled property

2018-10-02 23:11:05 +09:00

test-runner

Add the metalava_enabled property

2018-10-02 23:11:05 +09:00

tests

Merge "Send hostname and MTU options in DHCP ACK/OFFER"

2018-10-03 19:08:34 -07:00

tools

Merge "Add noexcept to move constructors and assignment operators."

2018-10-01 18:09:38 -07:00

vr

resolve merge conflicts of 606d3975b2 to stage-aosp-master

2018-08-06 16:30:26 +01:00

wifi

resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp

2018-10-04 22:50:39 +00:00

Android.bp

Merge "Make ext.jar only dependent on public SDK APIs" am: c457d8c95a

2018-09-26 06:30:38 -07:00

Android.mk

Merge "Enable jdiff for api-stubs-docs"

2018-09-19 03:02:19 +00:00

CleanSpec.mk

Merge "Build com.android.future.usb.accessory with java_sdk_library"

2018-06-28 20:38:09 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Upload hook that guides people towards AOSP.

2018-09-11 11:09:05 -06:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%