Dan Albert 59701b9ba5 resolved conflicts for merge of 97014933 to stage-aosp-master ...

Change-Id: I078368a7452b8cdc67f299985c60eef90f144367

2014-11-05 11:29:34 -08:00

api

SDK only: hide the old L API version constant.

2014-10-16 17:49:45 -07:00

cmds

Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master

2014-10-22 09:00:49 -07:00

core

am b0cb0734: Merge "Track change to Conscrypt"

2014-11-03 18:40:55 +00:00

data

Add Cutive Mono as serif monospace font for captioning

2014-10-10 12:52:25 -07:00

docs

am 21de5f3f: Doc change: misc changes to highlights.

2014-10-20 21:40:33 +00:00

drm

…

graphics

am 877ce2c4: Merge "Make sure the bitmap from VD\'s cache is drawn using bi-linear filter." into lmp-dev

2014-10-20 20:36:34 +00:00

include

…

keystore

…

libs

resolved conflicts for merge of 3028394c to stage-aosp-master

2014-10-29 12:12:37 +00:00

location

am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev

2014-10-08 22:48:44 +00:00

media

am 2fa604fc: Merge "Add missing break to switch statement" into lmp-dev

2014-10-20 22:13:58 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

2014-10-31 17:07:17 +00:00

policy

am 6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev

2014-10-09 19:15:32 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

am c8dce896: Merge "Fix not to show a log with empty default ime"

2014-10-30 03:06:12 +00:00

telecomm/java

Fix hangouts conference calling regression.

2014-10-09 01:15:58 +00:00

telephony/java

Fix to show low LTE signal strength as -140 instead of 0.

2014-10-10 17:05:46 -07:00

test-runner

am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev

2014-10-06 23:22:26 +00:00

tests

am b0cb0734: Merge "Track change to Conscrypt"

2014-11-03 18:40:55 +00:00

tools

am 9295a135: am e40974d9: Merge "Fix an overflow found by ASAN."

2014-10-20 22:01:02 +00:00

wifi/java/android/net/wifi

am a741efd5: Merge "adding debug information to bug report for Bug:16751877" into lmp-dev

2014-10-08 00:12:13 +00:00

Android.mk

Add WindowManager.aidl to AIDL list

2014-10-15 13:26:32 -07:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%