Chih-Hung Hsieh 0e5bd4e656 Merge "Use multiple patterns and/or emails in per-file syntax." ...

am: faac4ad153

Change-Id: Ia60c2884c1b8372862cae3d3f1e2b41c40cd1cb9

2018-08-27 01:56:06 -07:00

apct-tests/perftests

…

api

Merge "Added a new carrier config for data connection failed radio restart"

2018-08-22 23:42:36 +00:00

cmds

Modernize codebase by replacing NULL with nullptr

2018-08-08 14:08:35 -07:00

config

Merge "Track rename of org.kxml to com.android.org.kxml 2"

2018-08-24 11:53:05 +00:00

core

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

2018-08-27 01:56:06 -07:00

data

Merge "Audio assets: add NFC sounds"

2018-07-12 14:36:35 -07:00

docs

Camera: update tonemap image in html doc

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

drm

…

graphics/java/android

resolve merge conflicts of 1ddeb9e01f to stage-dr1-aosp-master

2018-08-02 17:31:50 +01:00

keystore

Merge "Correct the keystore alias used for secure imports"

2018-08-17 13:48:56 +00:00

libs

Merge changes Ie072511b,I6424f90c

2018-08-24 15:38:07 -07:00

location

Add @UnsupportedAppUsage annotations

2018-08-20 14:28:54 +01:00

lowpan

…

media

resolve merge conflicts of 2382108d01 to stage-aosp-master

2018-08-20 11:29:16 +01:00

native

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

2018-08-23 14:35:37 -07:00

nfc-extras

…

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 "Update owner file"

2018-08-21 03:10:15 -07:00

proto

DO NOT MERGE Log notification interruptions to TRON

2018-06-26 20:12:21 +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

Merge "Use multiple patterns and emails in per-file syntax."

2018-08-27 00:49:27 -07:00

telecomm

Merge "Add EXTRA_SKIP_CALL_FILTERING PhoneAccount extra"

2018-08-23 13:44:44 -07:00

telephony

Merge "Add PhoneCapabilityChanged in phone state listener"

2018-08-24 16:41:39 -07:00

test-base

Merge "Compile android.test.*.stubs into dex"

2018-07-11 09:18:15 +00:00

test-legacy

…

test-mock

resolve merge conflicts of 6e3c86c8ed to stage-aosp-master

2018-07-11 11:56:34 +01:00

test-runner

resolve merge conflicts of 6e3c86c8ed to stage-aosp-master

2018-07-11 11:56:34 +01:00

tests

Merge changes I2cea553a,Id8d3dcf6,I19e68e88,I35598935,Idd7dc369, ...

2018-08-23 20:33:45 -07:00

tools

Merge "dump package name"

2018-08-24 14:04:13 -07:00

vr

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

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

wifi

Merge "Add @UnsupportedAppUsage annotations"

2018-08-15 10:12:01 -07:00

Android.bp

Merge "Add compatibility check for (system|test_)api-stubs-docs"

2018-08-23 07:33:31 +00:00

Android.mk

Convert platformprotosnano and platformprotoslite to Android.bp

2018-08-20 13:57:24 -07: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

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%