CY Cheng 0f7856add6 resolve merge conflicts of e58c780571 to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352

2018-08-16 10:43:49 +00:00

apct-tests/perftests

Merge "Convert to Soong" am: acbd94d76f

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

api

Implementing support for HIDL native handles in Java

2018-08-13 14:31:17 -07:00

cmds

Modernize codebase by replacing NULL with nullptr

2018-08-08 14:08:35 -07:00

config

Merge "Add @UnsupportedAppUsage annotations"

2018-08-15 10:12:01 -07:00

core

resolve merge conflicts of e58c780571 to stage-aosp-master

2018-08-16 10:43:49 +00: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

resolve merge conflicts of 1ddeb9e01f to stage-dr1-aosp-master

2018-08-02 17:31:50 +01:00

keystore

Merge "Code reformatting for upcoming annotations." am: 60c8cfdd0f

2018-08-01 16:35:28 -07:00

libs

Merge "Fix TextureView.getBitmap with scale layer transform" into pi-dev

2018-07-18 16:54:22 -07:00

location

Add @UnsupportedAppUsage annotations

2018-08-09 16:52:22 +01:00

lowpan

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

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

media

Merge "Add @UnsupportedAppUsage annotations"

2018-08-15 06:52:39 -07:00

native

Add codewiz@, reminv@ to OWNERS for connectivity

2018-08-08 12:22:20 +09: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

Add @UnsupportedAppUsage annotations

2018-08-09 17:46:43 +01:00

packages

resolve merge conflicts of e58c780571 to stage-aosp-master

2018-08-16 10:43:49 +00:00

proto

DO NOT MERGE Log notification interruptions to TRON

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

rs

Merge "Add @UnsupportedAppUsage annotations"

2018-08-06 09:38:58 -07:00

samples/training/network-usage

…

sax

Merge "Move XML object factory logic to libcore"

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

services

Merge "Simplify IWeaver mocking code."

2018-08-15 13:04:40 -07:00

telecomm

Merge "Add @UnsupportedAppUsage annotations" am: 44091cdb47

2018-08-06 12:25:51 -07:00

telephony

Merge "Abstract set APIs in SubscriptionManager"

2018-08-15 19:27:12 -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-21 15:59:56 +00: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 "Add codewiz@, reminv@ to OWNERS for connectivity" am: 76f081be5c

2018-08-08 11:57:20 -07:00

tools

Merge "Work around b/70221552" am: f06d3a9857

2018-08-08 14:57:25 -07:00

vr

resolve merge conflicts of 606d3975b2 to stage-aosp-master

2018-08-06 16:30:26 +01:00

wifi

Merge "Add @UnsupportedAppUsage annotations"

2018-08-15 10:12:01 -07:00

Android.bp

Merge "Implementing support for HIDL native handles in Java"

2018-08-14 09:54:46 -07:00

Android.mk

Merge changes from topic "offlinesdk-docs"

2018-08-07 00:05:27 +00: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%