Remi NGUYEN VAN f6509edebb resolve merge conflicts of f121c090c2 to pi-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ie9aab5e1d786f32d219a66dd7184a9209c684eeb

2018-05-18 14:24:09 +09:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

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

api

Merge "Unhide constructors of DataService and NetworkService."

2018-05-15 18:54:50 +00:00

cmds

Merge "ValueMetric pushed events should check condition" into pi-dev

2018-05-17 15:53:17 -07:00

config

Merge "Add two more camera APIs to light grey." into pi-dev

2018-05-17 06:42:06 -07:00

core

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

2018-05-18 14:24:09 +09:00

data

Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev

2018-04-17 00:04:53 +00:00

docs

DisplayCutout: Add clarifying images to LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES

2018-03-28 15:00:45 +02:00

drm

Stop using Arrays.checkOffsetAndCount.

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

graphics/java/android

AnimatedImageDrawable: Eliminate unnecessary calls to redraw

2018-05-16 18:51:07 -04:00

keystore

Use the @Nullable annotations for choosePrivateKeyAlias.

2018-04-30 09:27:31 +00:00

libs

Merge "AnimatedImageDrawable: Eliminate unnecessary calls to redraw" into pi-dev

2018-05-17 13:06:32 -07:00

location

Simplify Javadoc for easier parsing.

2018-05-11 11:21:05 -07:00

lowpan

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

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

media

Merge "Convert to Soong" am: acbd94d76f

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

native

Merge "Convert to Soong" am: acbd94d76f

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

nfc-extras

Add api txt files for nfc-extras

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

obex

…

opengl/java

…

packages

Merge "Do not allow bouncer translation when scrimmed" into pi-dev

2018-05-17 18:53:18 -07:00

proto

Add metric to log use of hush gesture

2018-05-16 13:18:05 +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

…

services

Merge "Allow adb to pull profile snapshots" into pi-dev

2018-05-17 18:39:56 -07:00

telecomm

Merge "Add CallAudioState ctor as TestApi" into pi-dev

2018-05-14 14:27:34 -07:00

telephony

Add toString() method to PhysicalChannelConfig

2018-05-17 11:48:53 -07:00

test-base

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

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

test-legacy

…

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 changes Ieb0a5d24,I44df6668

2018-05-18 01:44:44 +00:00

tools

Merge "Update font chain linter to match latest font file" into pi-dev

2018-05-16 15:38:26 -07:00

vr

Convert to Soong

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

wifi

Merge "[RTT] Legacy RTT API: add attempted/succeeded counts" into pi-dev

2018-05-17 08:20:56 -07:00

Android.bp

Update Android.bp for api-stubs in order to do api-check.

2018-05-15 15:47:01 -07:00

Android.mk

Merge "Include in hidden API dark greylist based on package name" into pi-dev

2018-05-11 08:24:12 -07:00

CleanSpec.mk

Enforce dump permission in stats service

2018-04-16 15:04:28 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Merge "Add presubmit hook for hidden API lists." into pi-dev

2018-04-24 09:47:36 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%