Deepanshu Gupta 02cab444fb am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev ...

automerge: f4d3973

* commit 'f4d3973c319502fc8aa3e1aa1d7e7502274ea3aa':
  resolved conflicts for a0bc2e7e to lmp-mr1-dev

2015-01-05 23:39:03 +00:00

api

…

cmds

…

core

am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev

2015-01-05 23:39:03 +00:00

data

…

docs

…

drm

…

graphics

…

include

…

keystore

…

libs

…

location

…

media

…

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

…

policy

…

rs

…

samples/training/network-usage

…

sax

…

services

…

telecomm/java

…

telephony/java

…

test-runner

…

tests

…

tools

am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to lmp-mr1-dev" into lmp-mr1-dev

2015-01-05 23:39:03 +00:00

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%