Jeff Vander Stoep df01c2cf19 [automerger skipped] Merge "Check for /dev/memcg/system/tasks before writing to it" ...

am: 36ce625ccf  -s ours

Change-Id: I8112055d639675f0a2fd61e91e04793d480ad880

2018-07-23 13:39:03 -07:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

2018-05-15 15:06:19 -07:00

api

Merge "API updated for ICU4J 62.1"

2018-07-18 09:18:46 -07:00

cmds

Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev

2018-06-07 14:53:43 -07:00

config

[DO NOT MERGE] Update P light greylist in AOSP

2018-07-18 11:20:07 +00:00

core

Merge changes from topic "bionic_fdsan_java"

2018-07-20 21:14:33 -07:00

data

Merge "Audio assets: add NFC sounds"

2018-07-12 14:36:35 -07:00

docs

Camera: update tonemap image in html doc

2018-06-07 10:42:39 -07:00

drm

Stop using Arrays.checkOffsetAndCount.

2018-05-16 07:11:54 -07:00

graphics/java/android

Ensure picture isn't recording in createBitmap

2018-06-01 12:55:13 -07:00

keystore

Improve KeyChain documentation

2018-06-04 17:12:41 +01:00

libs

Merge "Disable LTO on -eng"

2018-07-11 14:48:50 -07:00

location

Merge "Build com.android.location.provider with java_sdk_library"

2018-06-14 21:59:40 -07:00

lowpan

Merge "Remove duplicate definitions of utility variables" am: 8d5a39ac62

2018-04-04 17:56:57 -07:00

media

libmedia2_jni: use libbinder as shared library

2018-07-18 17:20:44 +00:00

native

Merge "Work around b/24465209, do not pack relocation table." am: d01890df3c

2018-05-24 14:44:52 -07:00

nfc-extras

Add api txt files for nfc-extras

2018-05-12 22:36:10 +09:00

obex

Build java.obex with java_sdk_library

2018-05-30 00:19:01 +00:00

opengl/java

remove unused private field

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

packages

Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"

2018-07-18 14:59:20 +00:00

proto

New Autofill field: FIELD_AUTOFILL_SESSION_ID

2018-05-25 06:22:25 +00:00

rs

Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev

2018-03-23 22:11:38 +00:00

samples/training/network-usage

…

sax

Merge "Move XML object factory logic to libcore"

2018-07-12 11:26:03 -07:00

services

Merge "Avoid onServiceDisconnected() for unbind Service"

2018-07-23 12:10:57 -07:00

telecomm

Merge "Update InCallService API docs to explain how to show incoming call UI."

2018-07-13 15:37:40 -07:00

telephony

Merge "Quick style fixup of ISmsImplBase"

2018-07-23 10:59:25 -07:00

test-base

Merge "Compile android.test.*.stubs into dex"

2018-07-11 09:18:15 +00:00

test-legacy

Build android.test.base/legacy against SDK

2018-02-18 21:47:42 +09:00

test-mock

resolve merge conflicts of 6e3c86c8ed to stage-aosp-master

2018-07-11 11:56:34 +01:00

test-runner

resolve merge conflicts of 6e3c86c8ed to stage-aosp-master

2018-07-11 11:56:34 +01:00

tests

Merge "Remove SimChangeListener from Tethering"

2018-07-17 00:10:56 -07:00

tools

Merge "Add new "class2greylist" tool."

2018-07-23 10:08:47 -07:00

vr

Mark installable jars with installable: true

2018-07-10 14:30:07 -07:00

wifi

Merge "WifiManager: add call to see if apband conversion is required" into pi-dev

2018-06-06 09:51:50 -07:00

Android.bp

Merge "Enable the generate transaction name for system server."

2018-07-23 05:07:33 -07:00

Android.mk

Merge changes If285d71a,Iffe5be7c

2018-07-17 03:43:13 -07:00

CleanSpec.mk

Merge "Build com.android.future.usb.accessory with java_sdk_library"

2018-06-28 20:38:09 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

Remove Support Library from frameworks/base pathmap.mk

2018-02-15 11:37:52 -05:00

PREUPLOAD.cfg

Add presubmit hook for hidden API lists.

2018-05-08 10:29:50 +01:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%