Steve Elliott e30c42e456 [automerger skipped] DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f60801 to oc-dr1-dev ...

am: d2fa9c3ecf  -s ours

Change-Id: I2043a8ca20cd09064bc21f2d8d8841ec7281dfdf

2018-10-31 15:01:22 -07:00

apct-tests/perftests

PaintMeasureTextTest: only pause/resume not_cached benchmarks

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

api

Fix build more

2018-05-02 14:37:09 +02:00

cmds

…

config

…

core

DO NOT MERGE: Add configurable default setting for assistant componentname

2018-10-19 16:24:19 -04:00

data

…

docs

docs: Adding file to support staging reference docs

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

drm

…

graphics/java/android

AdaptiveIconDrawable should not update layer bounds when bound is empty

2018-01-26 20:29:04 +00:00

keystore

docs: Fixed key generator initialize method call.

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

legacy-test

…

libs

Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev am: 075bcf73c8

2018-06-06 20:49:18 -07:00

location

…

lowpan

…

media

Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev am: e43837e258

2018-07-16 13:13:13 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.

2018-09-05 20:40:23 +00:00

proto

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

2018-01-24 23:02:22 +00:00

rs

docs: fixing bug 36982027 and 30636712, typos

2018-03-20 17:59:48 -07:00

samples/training/network-usage

…

sax

…

services

Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev am: 7b08baaa2a

2018-09-28 17:53:41 -07:00

telecomm/java

Add assisted dialing properties to the framework.

2017-12-07 18:34:35 +00:00

telephony/java

Merge "Fix broken check for TelephonyManager#getForbiddenPlmns" into oc-dev am: 0a7c41615e

2018-04-30 15:39:15 -07:00

test-runner

…

tests

DO NOT MERGE: Add unit tests to ensure VPN meteredness

2018-05-25 22:11:51 +00:00

tools

Prevent AAPT from versioning <animated-selector> tags.

2018-01-09 15:24:21 +00:00

vr

…

wifi

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into oc-dev am: d05a3078fc

2018-02-08 00:03:07 +00:00

Android.bp

…

Android.mk

Enable new yaml file for reference nav that lists all framework files.

2018-03-01 19:03:25 +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%