Neil Fuller 93fcfbc8cb resolve merge conflicts of 83c367aa5b to stage-aosp-master ...

am: 8acdb8aa65

Change-Id: I7605323c886c9dafb83899c8b78e2bb860f96bb4

2017-09-20 14:55:08 +00:00

apct-tests/perftests

Merge "Increase the timeout and add stopping managed profile test"

2017-06-01 11:44:17 +00:00

api

Merge changes from topic "always-on-vpn" am: cc15c7f8c1

2017-09-19 08:09:41 +00:00

cmds

Merge "Remove unused variable from screencap."

2017-09-19 03:22:42 +00:00

core

resolve merge conflicts of 83c367aa5b to stage-aosp-master

2017-09-20 14:55:08 +00:00

data

app link handling under restricted mobile data

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

docs

docs: Restoring file to allow staging reference docs from Gerrit

2017-04-18 14:00:55 -07:00

drm

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

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

graphics/java/android

Reducing bitmap sizes in notifications

2017-07-19 18:06:09 +00:00

keystore

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

2017-08-16 17:24:05 +00:00

legacy-test

Clean up Predicate related code in android.test

2017-06-22 15:48:44 +01:00

libs

AAPT2: Fix processing of quotes in XML

2017-09-11 13:05:38 -07:00

location

Average of top 4 CNO

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

media

Merge "Fixed mimetype error of PPT file"

2017-08-28 22:27:38 +00:00

native

Merge "Remove TTS symbols from NDK stub library."

2017-08-22 18:03:10 +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

remove unused private field

2017-05-01 10:22:44 -04:00

packages

Merge changes from topic "vpn-dialog" am: 19bb1a0b99

2017-09-19 08:17:05 +00:00

proto

Merge "Wakeup packet events: addressing a few comments"

2017-09-19 07:21:12 +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

Remove unnecessary casts on calls to findViewById

2017-04-14 11:15:50 -04:00

sax

…

services

resolve merge conflicts of 83c367aa5b to stage-aosp-master

2017-09-20 14:55:08 +00:00

telecomm/java

Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."

2017-09-11 03:40:47 +00:00

telephony/java

Merge "Fix wrong reading the sms lengh of stored long sms in RUIM"

2017-09-19 23:55:48 +00:00

test-runner

Merge "Fix intermittent build failures with droiddoc generated sources"

2017-09-06 18:47:58 +00:00

tests

Merge changes from topic "vpn-dialog"

2017-09-19 08:09:45 +00:00

tools

AAPT2: Fix processing of quotes in XML

2017-09-11 13:05:38 -07:00

vr

Add vr platform lib

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

wifi

WifiManager: update docs on setWifiEnabled

2017-08-04 16:09:22 -07:00

Android.bp

Merge changes I93cf24d4,I32e438ef

2017-09-10 01:44:06 +00:00

Android.mk

Merge "Apply suggested edits to the file-download API"

2017-09-15 00:40:49 +00:00

CleanSpec.mk

Clean spec to deal with rename of auto_fill to autofill

2017-03-10 13:02:43 -08:00

compiled-classes-phone

Add AsyncTask to compiled classes

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

dirty-image-objects

Add dirty_image_objects file.

2017-08-03 11:02:02 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

preloaded-classes

Update preloaded classes for O

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

PREUPLOAD.cfg

Enable Checkstyle for "repo upload" for more projects.

2017-08-22 14:03:46 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%