Erik Kline de5803ecf8 Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19 am: aa9d12fa56" into oc-dev-plus-aosp ...

am: 94a7d5bfcf  -s ours

Change-Id: I0388ba2add121b330b8ddf4f75a0d6a04f0c2254

2017-07-06 08:21:03 +00:00

apct-tests/perftests

…

api

Merge "Merge "Merge "Track update of org.json API" am: c5a65bc152" into stage-aosp-master am: 93cc3d86ad" into oc-dev-plus-aosp

2017-07-05 23:09:23 +00:00

cmds

Merge "Add ability to turn off VR virtual display functionality." into oc-dr1-dev

2017-06-29 21:31:53 +00:00

core

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am: 21187ba5cc am: 1a6d0d753e

2017-07-06 01:58:59 +00:00

data

…

docs

…

drm

…

graphics/java/android

Merge "Fixed an issue where the shelf could be hidden" into oc-dr1-dev

2017-07-03 10:46:35 +00:00

keystore

Revert "Delete obsolete and unused KeyStoreTests". DO NOT MERGE ANYWHERE.

2017-06-26 20:38:07 +01:00

legacy-test

Clean up Predicate related code in android.test

2017-06-26 15:51:10 +01:00

libs

Cherry-pick 7ad1110ecd

2017-07-05 10:55:32 -07:00

location

Ensure complete GnssStatus construction

2017-06-28 15:13:10 -07:00

lowpan

…

media

AudioService: internal API for disabling audio playback for a UID

2017-06-27 17:57:34 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev

2017-07-06 06:31:54 +00:00

proto

add an auto-merge guard to the metrics constants file

2017-06-29 10:10:02 -04:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev

2017-07-06 05:56:14 +00:00

telecomm/java

Merge "Adds a new string definition for IMS Access blocked reason" into oc-dr1-dev

2017-07-05 22:17:01 +00:00

telephony/java

Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a

2017-07-06 02:16:11 +00:00

test-runner

Merge "Clean up ClassPathPackageInfoSource" am: 8c7026c5a3 am: 1c6a5ad92e

2017-06-27 11:03:11 +00:00

tests

Merge "ConnectivityManager: allow usage of TYPE_NONE" am: 279f32ded5 am: 0537f16516

2017-07-05 14:47:56 +00:00

tools

Merge "Stop loading other package's font by default." into oc-dev

2017-06-23 04:23:44 +00:00

vr

…

wifi

Merge "[P2P] Eliminate separate storage of binders - a memory leak" into oc-dr1-dev

2017-06-24 00:36:56 +00:00

Android.bp

…

Android.mk

Add EuiccManager#retainSubscriptionsOnFactoryReset API.

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

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

preloaded-classes

…

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%