Deepanshu Gupta b95475404e resolved conflicts for merge of 20db8770 to master ...

Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc

2015-01-06 16:41:58 -08:00

api

Add getDither, getFilterBitmap to Drawable for CTS testing

2015-01-06 11:01:36 -08:00

cmds

am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev

2015-01-05 22:21:51 +00:00

core

resolved conflicts for merge of 20db8770 to master

2015-01-06 16:41:58 -08:00

data

Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev

2014-12-05 07:27:33 +00:00

docs

resolved conflicts for merge of 6302a72a to master

2015-01-06 16:31:37 -08:00

drm

…

graphics

Add getDither, getFilterBitmap to Drawable for CTS testing

2015-01-06 11:01:36 -08:00

include

Make DisplayListRenderer inherit from Canvas, merge JNI

2015-01-05 15:25:41 -08:00

keystore

Track change to Conscrypt

2014-11-26 09:08:40 -08:00

libs

Add overrides and switch to nullptr keyword for all files

2015-01-05 16:49:13 -08:00

location

am a4c40c37: am 72d33849: Merge "Missing break in switch statement"

2014-12-30 12:29:38 +00:00

media

am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."

2015-01-06 20:09:12 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am 08fb858f: am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev

2015-01-06 00:54:34 +00:00

policy

am d8aa4660: am da90a9c2: Merge "Do not allow the navigation bar to move if width == height"

2015-01-06 16:56:46 +00:00

rs

Fix typo with register native allocation.

2014-12-16 10:13:05 -08:00

samples/training/network-usage

…

sax

…

services

Merge "Fix crash caused by toHex returning exception"

2015-01-06 22:06:53 +00:00

telecomm/java

IMS: Set phone account in IMS Conference object

2014-12-17 13:06:46 -08:00

telephony/java

am 0994d12b: am d38218d8: am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"

2015-01-05 23:42:50 +00:00

test-runner

…

tests

am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev

2014-12-16 17:58:27 +00:00

tools

resolved conflicts for merge of 20db8770 to master

2015-01-06 16:41:58 -08:00

wifi/java/android/net/wifi

am a3c187bc: am f87606fe: Merge "add debug logs to confirm network flapping issue is fixed Bug:18706288" into lmp-mr1-dev

2014-12-18 22:28:38 +00:00

Android.mk

am 4dcc8d28: am d7771768: Merge "Build against libphonenumber-platform."

2014-12-23 13:49:33 +00:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove DefaultHostnameVerifier from preloaded-classes.

2014-12-04 09:41:46 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%