Pengquan Meng 8c1e4e80b1 resolve merge conflicts of 8f843170a4 to qt-qpr1-dev-plus-aosp ...

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

2019-08-26 00:18:52 -07:00

apct-tests/perftests

…

api

Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447

2019-08-23 03:18:47 -07:00

cmds

Fix android-cloexec-pipe clang-tidy warning am: 1fa946a2f2

2019-08-23 21:24:30 -07:00

config

…

core

Merge "Rename android.compat.IPlatformCompat" am: ee716a23a2 am: 81af0fc8bb am: 20f25166c3

2019-08-23 22:04:54 -07:00

data

Add keylayout for Xbox One USB controller

2019-08-19 13:21:15 -05:00

docs

…

drm

…

graphics

…

keystore

…

libs

…

location

glob pattern is used for AIDL files under frameworks/base

2019-08-20 14:06:03 +09:00

lowpan

…

media

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master

2019-08-14 12:04:06 -07:00

mime

Move default MimeMap implementation to frameworks.

2019-08-21 14:46:50 +01:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev

2019-08-23 18:30:39 +00:00

proto

…

rs

…

samples/training/network-usage

…

sax

…

services

Merge "NetworkStackClient: Refactor network stack process interaction" into qt-qpr1-dev-plus-aosp

2019-08-26 03:12:07 +00:00

startop

Merge "[view compiler] Remove dex_builder_test.cc"

2019-08-05 10:06:15 -07:00

telecomm

DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master

2019-08-13 16:36:37 -07:00

telephony

Merge "Added Part & Addr Constants." am: f5d5de8a0f am: 633db92447 am: 40efe816dd

2019-08-23 22:06:14 -07:00

test-base

…

test-legacy

…

test-mock

…

test-runner

…

tests

NetworkStackClient: Refactor network stack process interaction

2019-08-23 19:04:48 +00:00

tools

Merge "Fix dependency on APK used by test"

2019-08-05 14:19:06 -07:00

wifi

Increased precision of Lat/Lng decoder and enabled BSSID list to be explicit (client)

2019-08-16 21:11:21 +00:00

.gitignore

…

Android.bp

Merge "Move default MimeMap implementation to frameworks."

2019-08-23 02:13:28 -07:00

Android.mk

…

CleanSpec.mk

…

jarjar_rules_hidl.txt

…

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%