Chiachang Wang bcfa1bfe3d resolve merge conflicts of c564b6e118 to pi-dev-plus-aosp ...

Test: Fix conflict as instruction
Bug: None
Change-Id: I315b2c0ab50d033588dce75e6976f5ccbb5bed29
Merged-In: I96f74d938663d579e4fea1eee6a4a250d7e21b3a

2019-01-16 11:14:27 +08:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

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

api

Merge "Make setMetered and setOpportunistic public." am: 609ed3380f

2019-01-15 17:17:51 -08:00

cmds

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

2019-01-16 11:14:27 +08:00

config

Merge "Support profile policy rule as a resolvable error."

2019-01-14 23:35:56 +00:00

core

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

2019-01-16 11:14:27 +08:00

data

Move a set of app privapp grants to /product

2019-01-15 10:33:38 +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

Fix spelling of "HARDWARE"

2019-01-07 17:42:05 -08:00

keystore

Limit access to suspected false positives.

2018-12-28 14:26:35 +00:00

libs

Merge "CursorWindow.cpp: replace dup() with fcntl(F_DUPFD_CLOEXEC)" am: adf025b1ff

2019-01-15 03:19:36 -08:00

location

Merge "Switch to metalava" am: 806939b1b1

2019-01-10 22:48:02 -08:00

lowpan

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

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

media

Merge "Switch to metalava" am: 806939b1b1

2019-01-10 22:48:02 -08:00

native

sharedmem.cpp: replace dup() with fcntl(F_DUPFD_CLOEXEC)

2019-01-14 13:53:40 -08: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 the new dumpstate listener methods to implementations" am: 55c2344bc5

2019-01-15 06:36:21 -08:00

proto

Merge "DO NOT MERGE Implement USB High Temperature warning dialog(1/N)" into pi-dev

2018-12-09 18:14:56 -08: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 "Make setMetered and setOpportunistic public." am: 609ed3380f

2019-01-15 17:17:51 -08:00

startop

Merge "[viewcompiler] Enable input from file descriptor" am: 040579c6a3

2019-01-15 14:00:35 -08:00

telecomm

Merge "Add CallerIdentification to CallScreeningService API." am: 6f37294f4c

2019-01-15 08:53:35 -08:00

telephony

Merge "Make setMetered and setOpportunistic public." am: 609ed3380f

2019-01-15 17:17:51 -08:00

test-base

Switch to metalava

2018-12-12 18:38:46 +09:00

test-legacy

Build android.test.* with java_sdk_library

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

test-mock

Switch to metalava

2019-01-09 16:12:24 +09:00

test-runner

Switch to metalava

2018-12-12 18:38:46 +09:00

tests

Merge "Add the NAT64 prefix to LinkProperties." am: 983e77db4a

2019-01-14 20:29:10 -08:00

tools

Merge "Add a struct wrapper for bytes fields in stats_log cpp APIs."

2019-01-11 19:02:29 +00:00

vr

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

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

wifi

Merge "Limit access to suspected false positives." am: aeda49d185

2019-01-02 05:00:54 -08:00

Android.bp

Merge "HIDL stuff to TestApi." am: bc79587a85

2019-01-15 13:41:59 -08:00

Android.mk

Merge "Add back doc-comment-check-docs back to checkbuild."

2018-12-13 19:10:07 +00:00

CleanSpec.mk

Move SystemUI and its permissions to /product

2019-01-11 16:32:33 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Enable checkstyle everywhere in frameworks/base.

2018-12-10 18:23:09 +09:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%