Neil Fuller 47d79db2b8 resolve merge conflicts of 7980b19bc8 to stage-aosp-master am: 3147288c3b ...

am: f53c7a2ae5

Change-Id: Id591cb0be593fd6e0e742c8e323f5a9cae21c30b

2018-07-06 10:05:44 -07:00

apct-tests/perftests

Merge "Tweak some RenderNode API surfaces"

2018-06-21 19:05:27 +00:00

api

Merge "Allow UiAutomation to adopt the shell permission indentity"

2018-07-04 03:00:14 +00:00

cmds

Merge "Add kernel version to incident report"

2018-06-26 21:15:05 +00:00

config

Get android.os tests running against real APIs.

2018-06-29 17:15:44 -06:00

core

Merge "Move displayId into InputEvent"

2018-07-05 18:28:56 +00: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

Merge "docs: repaired link to internal section" into pi-dev am: bcae0ff7a2

2018-06-13 11:41:18 -07:00

keystore

Merge "Correctly preserve key generation parameters" into pi-dev am: 6f7cfb0627

2018-07-03 12:07:59 -07:00

libs

Fix path rendering issues

2018-07-03 19:50:06 +00:00

location

Merge "Build com.android.location.provider with java_sdk_library" am: aa5d8dfeb0 am: abdaa314f8

2018-06-14 22:26:03 -07:00

lowpan

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

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

media

MediaPlayer2: merge EventHandler with TaskHandler

2018-07-03 16:57:38 -07:00

native

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

2018-05-24 21:02:54 -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 "Import translations. DO NOT MERGE"

2018-07-06 02:17:24 +00:00

proto

Merge "wifi.proto: Add metrics for failed SAR sensor reg"

2018-07-02 23:19:22 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Fix GraphicBuffer creation not to use 0 usage flag"

2018-07-06 02:06:10 +00:00

telecomm

Merge "Make RttTextStream's read interruptible" into pi-dev am: 21ef4b3acb

2018-06-26 15:39:56 -07:00

telephony

Merge "ImsMultiEndPoint - Sip Notify Change" am: bc103bdf18 am: 4a319c85bd

2018-07-03 17:09:58 -07:00

test-base

Fix broken links in @see tags in framework docs.

2018-06-05 14:44:30 -07:00

test-legacy

…

test-mock

Require READ_CALL_LOG permission to see phone numbers in phone state.

2018-05-18 14:37:43 -07:00

test-runner

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

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

tests

Merge "Initial UsageStatsDatabase Perf tests"

2018-07-03 21:15:15 +00:00

tools

AAPT2: Encode 4-byte strings in Modified UTF-8

2018-07-02 14:14:33 -07:00

vr

Convert to Soong

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

wifi

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

2018-06-22 11:34:55 -07:00

Android.bp

Merge "6/n: Have FaceService extend BiometricService"

2018-06-27 22:09:01 +00: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%