Inseob Kim 0c859fa482 resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp ...

am: f1ceee0166

Change-Id: If4355c580a8cd85fae95fd47510ca626f9c41bac

2019-08-23 20:10:05 -07:00

apct-tests/perftests

…

api

Merge "Wait until any background events are processed." into stage-aosp-master am: 0589325300

2019-08-21 12:31:17 -07:00

cmds

Merge "Adapt to google::protobuf::int64 type change" into stage-aosp-master am: e9a702d526

2019-08-21 14:49:35 -07:00

config

Merge "Add an empty boot profile."

2019-07-25 07:08:32 -07:00

core

DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager

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

data

Add keylayout for Xbox One USB controller

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

docs

…

drm

…

graphics

Merge "docs: Added missing comma in RectF class description." into qt-dev

2019-07-31 18:18:23 -07:00

keystore

…

libs

Merge "Increase dequeueBuffer timeout" into qt-r1-dev

2019-07-22 12:34:30 -07:00

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

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

[DO NOT MERGE]Daggerize Android Auto

2019-08-23 07:31:35 -07:00

proto

Merge "WifiMetrics: add per-band Tx and Rx speed histogram" into qt-r1-dev

2019-07-25 13:28:34 -07:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe

2019-08-23 04:19:30 -07: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 "Add fields to Cellbroadcast" into qt-qpr1-dev

2019-08-22 12:07:03 -07:00

test-base

Merge "Remove legacy-performance-test-hostdex"

2019-07-25 17:41:34 -07:00

test-legacy

…

test-mock

Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928

2019-06-03 08:15:50 -07:00

test-runner

Merge "Export some api files for use by cts/tests/signature tests" am: 0a45ac2928

2019-06-03 08:15:50 -07:00

tests

[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791

2019-08-21 14:40:27 -07: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 "Implement sysprop_library API stability check" into stage-aosp-master

2019-08-22 02:52:17 +00:00

Android.mk

…

CleanSpec.mk

…

jarjar_rules_hidl.txt

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

Add ktlint to preupload hooks

2019-07-24 15:54:24 +09:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%