Evan Charlton a3db733885 resolved conflicts for merge of 8d966e42 to master-nova ...

Change-Id: Ibcc7d1eb4f0349e90b8e97d5235a08efb8226ef6

2014-04-16 13:14:39 -07:00

api

resolved conflicts for merge of 8d966e42 to master-nova

2014-04-16 13:14:39 -07:00

cmds

…

core

am 34de7a83: Merge "Stub APIs for network scoring."

2014-04-16 19:10:07 +00:00

data

…

docs

…

drm

…

graphics

…

include

…

keystore

…

libs

…

location

…

media

am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"

2014-04-15 23:36:27 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am 3d72c067: Merge "Remove activitystrings.xml from localized resource directories"

2014-04-16 19:45:22 +00:00

policy

…

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event"

2014-04-16 19:45:20 +00:00

telecomm/java

…

telephony/java

resolved conflicts for merge of 8d966e42 to master-nova

2014-04-16 13:14:39 -07:00

test-runner

…

tests

…

tools

…

wifi/java/android/net/wifi

…

Android.mk

…

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%