Geoffrey Pitsch 3fe668a015 resolve merge conflicts of 180f4ee7f7 to master ...

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

2017-07-21 10:35:11 -04:00

apct-tests/perftests

Update user perf tests to report only mean.

2017-07-12 18:15:02 -07:00

api

Merge "[P2P] Public API to clean-up resources of P2P" into oc-mr1-dev am: dde0e6ad21

2017-07-21 05:34:26 +00:00

cmds

Merge changes from topic 'activity_view_v2'

2017-07-20 15:48:26 +00:00

core

resolve merge conflicts of 180f4ee7f7 to master

2017-07-21 10:35:11 -04:00

data

Unify permissions under UPDATE_DEVICE_STATS.

2017-07-17 16:10:55 -06:00

docs

…

drm

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944

2017-07-20 03:05:02 +00:00

graphics/java/android

Merge "Refactor TextUtils.join() and add documentation"

2017-07-21 08:08:31 +00:00

keystore

Refurbish granting mechanism

2017-06-23 09:27:12 -07:00

legacy-test

Repackage com.android.internal.util.Predicate

2017-07-13 12:46:53 +01:00

libs

Merge "Delete all ro.hwui.* props"

2017-07-20 16:59:14 +00:00

location

Average of top 4 CNO

2017-07-10 19:00:27 +00:00

lowpan

Revert "lowpan: Introduce new unit tests for data classes"

2017-07-18 11:51:20 -07:00

media

Media API: fix possible NPE

2017-07-20 11:43:03 -07:00

native

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944 am: c840945a78

2017-07-20 03:11:00 +00:00

nfc-extras

Fixed nfc-extras build files

2017-05-23 11:51:15 +01:00

obex

OBEX: Add required parameters TAG ID's for PBAP 1.2

2017-05-20 00:27:31 +00:00

opengl/java

…

packages

Merge "Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev am: 6b4f0bb6fe am: 30f2df2f34" into oc-mr1-dev-plus-aosp

2017-07-21 05:40:16 +00:00

proto

Merge "Add metrics constant for data plan usage screen."

2017-07-20 19:26:33 +00:00

rs

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944

2017-07-20 03:05:02 +00:00

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of 180f4ee7f7 to master

2017-07-21 10:35:11 -04:00

telecomm/java

Merge "Add timezone for Telecom event date formatting" am: bf296640e6 am: 5af59940d1 am: af3d7f990a

2017-07-20 00:20:19 +00:00

telephony/java

Merge "Add new column user_editable to Carriers table in telephony db." into oc-dr1-dev

2017-07-20 20:59:52 +00:00

test-runner

Separate android.test.mock classes from android.test.runner

2017-07-17 15:25:04 +01:00

tests

Merge "IpManagerTest: fix flaky test for real" am: e0a743d035 am: 3d423c9c39 am: 8b8a0ef586

2017-07-21 08:33:46 +00:00

tools

Merge "Let's get a constant for O_MR1."

2017-07-20 03:20:22 +00:00

vr

Add vr platform lib

2017-05-10 16:54:20 -07:00

wifi

[P2P] Public API to clean-up resources of P2P

2017-07-20 14:00:41 +00:00

Android.bp

Revert work around clang-tidy segmentation fault.

2017-06-12 09:45:47 -07:00

Android.mk

Merge "NFC DTA Integration" into oc-dr1-dev am: f8469ccf17 am: 1d3929d46a

2017-07-21 05:21:07 +00:00

CleanSpec.mk

…

compiled-classes-phone

Update preloaded classes for O

2017-05-25 01:03:26 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

preloaded-classes

Update preloaded classes for O

2017-05-25 01:03:26 +00:00

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%