Jack Yu 0c5f8dfaca resolve merge conflicts of c3415d2bc6 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I072c3d46b81dee0a83036ea7d5e91bd1989fa250

2018-02-03 20:42:01 -08:00

apct-tests/perftests

Fix wrong parameter for StaticLayoutPerfTest

2018-02-01 16:48:52 -08:00

api

Merge "Merge "Add DENSITY_440" am: 6c40bbdc5e am: a21fa41755 am: 1d64dc96f7"

2018-02-04 01:13:56 +00:00

cmds

Merge "Add atom and logging for app overlay"

2018-02-03 01:17:42 +00:00

config

Droidfood only: Extend the hidden API light greylist

2018-02-01 17:12:30 +00:00

core

resolve merge conflicts of c3415d2bc6 to master

2018-02-03 20:42:01 -08:00

data

Merge "Media process should run with "write" access."

2018-02-04 00:12:22 +00:00

docs

Merge "Updating more spans"

2018-02-02 00:26:48 +00:00

drm

…

graphics/java/android

Merge "Use ImageDecoder in ImageView.getDrawableFromUri"

2018-02-02 19:51:41 +00:00

keystore

Add Confirmation API.

2018-01-30 17:33:21 -05:00

libs

Merge "Fix the tag size in token of ProtoOutputStream.cpp, the java version has the correct tag size computed."

2018-02-03 00:54:27 +00:00

location

Remove unused methods from LocationManagerService

2018-02-01 18:56:53 +00:00

lowpan

Flatten dependency hierarchy of legacy-android-test

2017-12-07 07:38:59 +00:00

media

Merge "Fix typo in MicrophoneInfo"

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

native

New NDK APIs for SurfaceTexture

2018-02-02 03:06:05 +00:00

nfc-extras

Use stubs libs for android.test.base/runner/mock

2018-01-24 15:30:13 +09:00

obex

OBEX: Avoid pre-sending CONTINUE for SRM enabled case

2017-11-29 18:18:58 +00:00

opengl/java

…

packages

Merge "Dump usb as DualDump"

2018-02-03 02:56:30 +00:00

proto

Add metric num_connectivity_oneshot_scans

2018-01-31 17:36:43 -08:00

rs

Revert "Replace AssetManager with AssetManager2 implementation"

2018-01-25 17:39:40 -08:00

samples/training/network-usage

…

sax

Stop statically including legacy-android-test

2017-12-08 00:07:17 +00:00

services

Merge "Enable multiple active Ethernet interfaces" am: 0a6c539901 am: ac908d6728

2018-02-04 01:06:51 +00:00

telecomm/java

Merge "Add call recording tone support." am: 8d5b08c430 am: eb74233ff9

2018-02-02 08:02:44 +00:00

telephony/java

resolve merge conflicts of c3415d2bc6 to master

2018-02-03 20:42:01 -08:00

test-base

Create test-legacy/ for android.test.legacy target

2018-01-31 11:21:22 +00:00

test-legacy

Create test-legacy/ for android.test.legacy target

2018-01-31 11:21:22 +00:00

test-mock

Add conscrypt, okhttp, bouncycastle to the classpath when building stubs

2018-01-26 14:53:50 +09:00

test-runner

Create test-legacy/ for android.test.legacy target

2018-01-31 11:21:22 +00:00

tests

Merge "Reduce initial app launch timeout."

2018-02-02 20:26:35 +00:00

tools

AAPT2: Fix typo in BinaryPrimitives oneofs

2018-01-30 21:15:36 -08:00

vr

Use -Werror in frameworks/base

2017-11-20 11:13:48 -08:00

wifi

[RTT] Route legacy RTT API on top of new RTT API

2018-02-01 06:43:15 -08:00

Android.bp

Revert "Move CarServiceHelperService"

2018-02-03 01:54:11 +00:00

Android.mk

Merge "Droidfood only: Move private APIs to dark greylist by default"

2018-02-01 11:07:39 +00:00

CleanSpec.mk

…

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%