Steve Elliott d2fa9c3ecf DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f60801 to oc-dr1-dev ...

Bug: 111603898
Test: manual
Change-Id: I5933f27f2fbd90a6de447fbf7f17063f6b7f1fb8

2018-10-31 16:29:12 +00:00

apct-tests/perftests

…

api

resolve merge conflicts of 490d397d28 to oc-dr1-dev

2017-08-29 22:56:44 +00:00

cmds

Cherry-pick: Add null check for Wi-Fi command

2017-08-08 11:19:35 -07:00

core

DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f60801 to oc-dr1-dev

2018-10-31 16:29:12 +00:00

data

app link handling under restricted mobile data

2017-08-04 18:13:12 -07:00

docs

…

drm

…

graphics/java/android

AdaptiveIconDrawable should not update layer bounds when bound is empty

2018-01-26 20:29:04 +00:00

keystore

Merge "docs: corrected code example mistakes" into oc-dev

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

legacy-test

…

libs

Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev

2018-06-06 18:53:39 -07:00

location

Average of top 4 CNO

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

media

Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev

2018-07-16 12:51:28 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Hide overlay windows when requesting media projection permission.

2018-09-05 20:39:51 +00:00

proto

Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev

2017-12-08 18:39:01 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev

2018-09-28 17:26:46 -07:00

telecomm/java

Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev

2017-08-11 20:52:52 +00:00

telephony/java

Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev

2018-04-30 15:29:19 -07:00

test-runner

…

tests

NetworkCapabilities: fix describeImmutableDifferences

2017-08-05 11:37:10 +09:00

tools

AAPT2: Disable locale domination for deduping

2017-08-04 17:23:14 -07:00

vr

…

wifi

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev

2018-02-07 23:43:32 +00:00

Android.bp

…

Android.mk

Revert "Time zone update API classes"

2017-08-12 01:21:10 +00:00

CleanSpec.mk

…

compiled-classes-phone

Add AsyncTask to compiled classes

2017-07-27 15:47:33 -07:00

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%