Android Build Merger (Role) a8e2306430 [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd ...

am: 8eb39fb0f4  -s ours

Change-Id: Iadcf60e51485dc0952c6f7800a996e91585854a5

2018-01-25 21:48:48 +00:00

apct-tests/perftests

…

api

resolve merge conflicts of 490d397d28 to oc-dr1-dev

2017-08-29 22:56:44 +00:00

cmds

Cherry-pick: Add null check for Wi-Fi command

2017-08-08 11:19:35 -07:00

core

Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d8)" into oc-dev

2018-01-12 05:31:38 +00:00

data

app link handling under restricted mobile data

2017-08-04 18:13:12 -07:00

docs

…

drm

…

graphics/java/android

…

keystore

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

2017-08-16 17:12:08 +00:00

legacy-test

…

libs

…

location

…

media

Merge "mtp: fix double free of thumbnail data" into nyc-dev am: 914bc14e82 am: f9e16c9899 am: 396487f5aa am: 5330335288 am: db258ebba8

2017-10-31 00:26:33 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Auto-dim refinements

2017-10-26 14:14:16 -04:00

proto

Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev

2017-12-08 18:39:01 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Proper autofill fix to let phone process autofill Settings activity.

2017-12-14 01:49:36 +00:00

telecomm/java

Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev

2017-08-11 20:52:52 +00:00

telephony/java

resolve merge conflicts of 6df58d8da1 to oc-dr1-dev

2017-09-18 17:57:45 +00:00

test-runner

…

tests

NetworkCapabilities: fix describeImmutableDifferences

2017-08-05 11:37:10 +09:00

tools

AAPT2: Disable locale domination for deduping

2017-08-04 17:23:14 -07:00

vr

…

wifi

Merge "Docs: Adds brief instructions for how to do Wi-Fi scan. Bug: 67967771 Test: Ran make ds-docs." into oc-dev

2017-10-25 06:48:22 +00:00

Android.bp

…

Android.mk

Revert "Time zone update API classes"

2017-08-12 01:21:10 +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%