Winson Chung 51d7ff2f38 Merge changes I52152223,I49db5cab into oc-dr1-dev ...

am: fc596b1cf6

Change-Id: I63cbca0986438b350cecf0f2c1c5b0ec2f88cebf

2017-08-09 19:01:53 +00:00

apct-tests/perftests

…

api

DO NOT MERGE: Fix searching for overridden methods.

2017-08-03 17:47:39 +00:00

cmds

Merge "Add null check for Wi-Fi command" am: 43ee2ac140 am: 51e24de109

2017-08-08 18:27:19 +00:00

core

Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev

2017-08-09 17:41:48 +00:00

data

app link handling under restricted mobile data

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

docs

…

drm

…

graphics/java/android

…

keystore

…

legacy-test

…

libs

Fix compile issue

2017-08-02 15:04:07 -07:00

location

…

lowpan

…

media

Merge "Fix graphical artifact in the fisheye effect" am: 0b885b8096 am: f22a6f7c60

2017-08-09 07:45:55 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge changes I52152223,I49db5cab into oc-dr1-dev

2017-08-09 19:01:53 +00:00

proto

WifiMetrics: add histogram of connectable networks

2017-07-31 14:40:19 -07:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Add UserQuotaTracker to IpSecService" am: a0c97b3ddb am: 3546a5ef92

2017-08-09 18:36:13 +00:00

telecomm/java

Merge "Remove Conferenceable update squelching" into oc-dr1-dev

2017-08-02 21:40:34 +00:00

telephony/java

Merge "initial value for data_roaming based on carrier"

2017-08-09 17:42:29 +00:00

test-runner

…

tests

Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"

2017-08-08 08:30:03 +00:00

tools

Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev

2017-08-07 17:43:05 +00:00

vr

…

wifi

Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev

2017-08-02 22:09:15 +00:00

Android.bp

…

Android.mk

resolve merge conflicts of 15658662fd to stage-aosp-master am: 3b38eaa3c2

2017-08-09 16:19:32 +00:00

CleanSpec.mk

…

compiled-classes-phone

Add AsyncTask to compiled classes

2017-07-27 15:47:33 -07:00

dirty-image-objects

Add dirty_image_objects file.

2017-08-03 11:02:02 -07:00

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%