fionaxu 619e5c8ecc resolve merge conflicts of 6c7ef2e8d7 to stage-aosp-master ...

Test: I solemnly swear I tested this conflict resolution.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205

2017-09-07 07:01:12 +00:00

apct-tests/perftests

…

api

Merge "Adapt ICU 59 API update to Doclava changes."

2017-08-29 13:54:14 +00:00

cmds

Merge "idmap: include idmap version in check for stale file"

2017-09-06 20:36:28 +00:00

core

Merge "Separate GraphicsEnv from libui"

2017-09-06 15:53:00 +00:00

data

…

docs

…

drm

…

graphics/java/android

…

keystore

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

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

legacy-test

…

libs

Merge "idmap: include idmap version in check for stale file"

2017-09-06 20:36:28 +00:00

location

…

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

…

obex

…

opengl/java

…

packages

Merge "Fix NPE in StatusBar#onBackPressed()"

2017-09-06 15:17:05 +00:00

proto

…

rs

…

samples/training/network-usage

…

sax

…

services

Merge "ConnectivityService: improve wakelock logging"

2017-09-05 14:01:20 +00:00

telecomm/java

Merge "Emergency redial implementation"

2017-08-25 20:31:26 +00:00

telephony/java

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

2017-09-07 07:01:12 +00:00

test-runner

Merge "Fix intermittent build failures with droiddoc generated sources"

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

tests

Merge "Nat464Xlat: correct racefree teardown"

2017-09-05 12:30:08 +00:00

tools

Merge changes I7218f17a,I96b7340a

2017-08-31 21:44:25 +00:00

vr

…

wifi

…

Android.bp

…

Android.mk

Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev

2017-08-10 17:46:32 +00:00

CleanSpec.mk

…

compiled-classes-phone

…

dirty-image-objects

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

preloaded-classes

…

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%