Neil Fuller f53c7a2ae5 resolve merge conflicts of 7980b19bc8 to stage-aosp-master ...

am: 3147288c3b

Change-Id: Ie04ef5cd3277271304c3564ee6e41d8c24dee74c

2018-07-06 09:59:52 -07:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

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

api

Merge "Emergency SMS carrier config flag"

2018-06-28 17:26:39 -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

Merge "Stabilize hidden API lists" into pi-dev

2018-06-21 06:07:22 +00:00

core

resolve merge conflicts of 7980b19bc8 to stage-aosp-master

2018-07-06 09:59:52 -07:00

data

Merge changes from topic "audio-package-update"

2018-06-08 17:11:41 -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

docs: repaired link to internal section

2018-06-07 13:29:41 -07:00

keystore

Correctly preserve key generation parameters

2018-06-28 17:20:01 +01:00

libs

Merge "Build com.android.future.usb.accessory with java_sdk_library" am: 10cfc61774

2018-06-28 20:53:52 -07:00

location

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

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

lowpan

…

media

Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev

2018-06-27 12:34:49 -07: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

…

packages

Merge "Remove unusual static method call" am: cbe9c295a3

2018-07-05 05:46:04 -07:00

proto

DO NOT MERGE Log notification interruptions to TRON

2018-06-26 20:12:21 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Always close file descriptors" am: 26025a06ec

2018-07-05 05:32:16 -07:00

telecomm

Merge "Make RttTextStream's read interruptible" into pi-dev

2018-06-26 15:17:12 -07:00

telephony

Merge "ImsMultiEndPoint - Sip Notify Change" am: bc103bdf18

2018-07-03 16:36:52 -07:00

test-base

…

test-legacy

…

test-mock

…

test-runner

Merge "Convert android.test.runner.stubs to Soong" am: 6fa8d06c78

2018-05-07 18:25:56 -07:00

tests

Merge "Add in-app tracepoints to TouchLatency app."

2018-07-02 17:57:29 -07:00

tools

Fix ManifestMerger issues

2018-06-15 23:03:46 +00:00

vr

Convert to Soong

2018-05-14 16:47:02 -07:00

wifi

Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev

2018-06-22 11:26:10 -07:00

Android.bp

resolve merge conflicts of 55c0a66825 to stage-aosp-master

2018-06-26 04:05:36 -07:00

Android.mk

Include annotations in metalava stubs

2018-07-02 14:06:21 -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

…

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%