Android Build Merger (Role) 33fc64360a Merge changes from topic "am-56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp ...

* changes:
  Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev am: f310c792d4 am: 94b7fafc69 am: e977655e31
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd am: 8eb39fb0f4  -s ours am: a8e2306430  -s ours am: 6ccac2ffc3  -s ours

2018-01-25 22:24:12 +00:00

apct-tests/perftests

PaintMeasureTextTest: only pause/resume not_cached benchmarks

2017-11-30 20:35:21 +00:00

api

Merge "Update CellInfo API to accomodate new fields."

2018-01-25 12:50:37 +00:00

cmds

DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager

2018-01-12 15:35:43 +00:00

config

Create hidden API lists

2018-01-24 20:48:37 +00:00

core

Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d

2018-01-25 22:19:53 +00:00

data

Merge "Adding "Mobile data" and "Data usage" button in mobile settings."

2017-11-21 00:35:42 +00:00

docs

docs: Adding file to support staging reference docs

2018-01-08 15:57:29 -08:00

drm

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944

2017-07-20 03:05:02 +00:00

graphics/java/android

Merge "BitmapDrawable: Suppress errorprone warning" am: 25e50ccccb

2018-01-25 02:48:37 +00:00

keystore

docs: Fixed key generator initialize method call.

2017-11-29 12:06:52 -08:00

libs

Fix doFadingAnimationLocked in sanitized builds.

2018-01-12 16:48:38 -08:00

location

Average of top 4 CNO

2017-07-10 19:00:27 +00:00

lowpan

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

2017-08-10 08:56:41 -07:00

media

Merge "Multi-A2DP support - add a new internal API to suppress Audio Noisy intent" am: 7e3b1832c4

2018-01-21 00:33:40 +00:00

native

Fixing app compat issue b/72143978

2018-01-18 16:24:11 -08:00

nfc-extras

Fixed nfc-extras build files

2017-05-23 11:51:15 +01:00

obex

OBEX: Avoid pre-sending CONTINUE for SRM enabled case

2017-11-29 18:18:58 +00:00

opengl/java

remove unused private field

2017-05-01 10:22:44 -04:00

packages

Merge "PrintSpooler: Fix EqualsNaN in test" am: ffcf3ff77d

2018-01-25 16:10:00 +00:00

proto

Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev

2018-01-24 23:14:30 +00:00

rs

Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944

2017-07-20 03:05:02 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Tcp socket metrics: implement INetdEventListener callback" am: 93b1787a3d

2018-01-25 22:19:53 +00:00

telecomm/java

Merge "Add permission check for old call handover apis."

2018-01-12 23:50:40 +00:00

telephony/java

Merge "Fill in methods in EuiccCardController." am: 197f072da2

2018-01-25 22:06:08 +00:00

test-base

Replace legacy-test with android.test.base in bp files

2018-01-15 15:47:47 +00:00

test-mock

Replace legacy-test with android.test.base in bp files

2018-01-15 15:47:47 +00:00

test-runner

Replace legacy-test with android.test.base in bp files

2018-01-15 15:47:47 +00:00

tests

Merge "Add tunnel-mode calls to netd in IpSecService" am: 475fe28c50

2018-01-24 19:56:24 +00:00

tools

Merge "Fail when there is an ASM error" am: 4152497b4b

2018-01-24 12:36:26 +00:00

vr

Use -Werror in frameworks/base

2017-11-20 11:13:48 -08:00

wifi

Merge changes from topic "predicates_aosp" am: 76c275e7d3

2017-12-07 18:31:52 +00:00

Android.bp

Added network service interface

2018-01-24 19:13:45 +00:00

Android.mk

Create hidden API lists

2018-01-24 20:48:37 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%