Ian Pedowitz a27856d443 resolve merge conflicts of 695f21a661 to oc-dr1-dev ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7

2017-06-07 19:52:10 -07:00

apct-tests/perftests

…

api

Merge "Add new haptic feedback constant for virtual key release."

2017-06-06 21:35:51 +00:00

cmds

Merge "Enable wide color gamut rendering"

2017-06-02 20:07:56 +00:00

core

Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev

2017-06-07 23:31:48 +00:00

data

…

docs

…

drm

Redundant/duplicate method to close Streams

2017-06-06 14:20:02 -04:00

graphics/java/android

Merge "Better error message for AVD" into oc-dev

2017-06-07 19:40:53 +00:00

keystore

…

legacy-test

…

libs

Merge "Implement CacheManager for the Skia pipelines."

2017-06-06 20:37:08 +00:00

location

Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37

2017-06-06 16:17:39 +00:00

lowpan

Initial support for proposed android.net.lowpan

2017-06-05 17:47:16 +00:00

media

Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c am: 2c1d4f8f7b

2017-06-07 00:31:33 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

resolve merge conflicts of 695f21a661 to oc-dr1-dev

2017-06-07 19:52:10 -07:00

proto

Add logging to track search no-result case

2017-06-06 12:37:13 -07:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev

2017-06-07 23:31:48 +00:00

telecomm/java

Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37

2017-06-06 16:17:39 +00:00

telephony/java

Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37

2017-06-06 16:17:39 +00:00

test-runner

Merge "Added android.test.mock and android.test.mock.sdk targets" am: 46f8d427c4 am: de30ee2d40

2017-06-06 08:13:12 +00:00

tests

Merge "Remove usages of ActionBarActivity." into oc-dev

2017-06-06 21:29:29 +00:00

tools

AAPT2: Do not interpret %n as a format specifier in string resources

2017-06-06 20:02:38 +00:00

vr

…

wifi

[P2P] Add binder to service calls

2017-06-06 17:23:44 +00:00

Android.bp

…

Android.mk

Merge "Initial support for proposed android.net.lowpan"

2017-06-06 20:25:54 +00:00

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

preloaded-classes

…

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%