Neil Fuller 7014da74e8 resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp ...

Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0

2015-01-20 13:21:58 +00:00

api

Unhide getDataRoaming, Messenger uses it to decide to download MMS or not.

2015-01-14 12:12:02 -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:20:28 +00:00

core

resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp

2015-01-20 13:21:58 +00: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

am 11ce4b75: am c68ab86a: am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs

2015-01-17 05:31:43 +00:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

am 628e646e: am aa229902: Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev

2015-01-15 01:39:44 +00:00

include

am 9568307c: am 43a4a8c7: Fix redundant file backups

2015-01-15 01:39:29 +00:00

keystore

Merge "Remove DSA support from Android KeyStore and KeyChain."

2015-01-16 16:44:22 +00:00

libs

am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementation for the common case"

2015-01-16 18:07:23 +00:00

location

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

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

media

am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue."

2015-01-16 17:37:29 +00:00

native

Merge "Frameworks/base: Wall Werror in native/graphics"

2014-11-11 01:56:11 +00:00

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

2015-01-16 20:40:18 +00:00

policy

am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de

2015-01-13 02:24:11 +00:00

rs

New Script Group API.

2015-01-07 15:07:16 -08:00

samples/training/network-usage

…

sax

…

services

am d38f077b: am 5b8cb00b: CEC: Process new options for CEC/MHL HAL

2015-01-19 02:53:19 +00:00

telecomm/java

Fix for call timer resetting when starting IMS conference call. 1/4

2015-01-12 09:02:01 -08:00

telephony/java

am 543348eb: am d2dd69ae: Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

2015-01-17 22:30:25 +00:00

test-runner

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00:00

tests

am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev

2015-01-14 20:47:47 +00:00

tools

am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev

2015-01-14 20:47:47 +00: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:26:38 +00:00

Android.mk

resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp

2015-01-14 13:51:45 -08:00

CleanSpec.mk

Obliterate LockPatternUtilsCache

2014-11-12 11:31:38 +00:00

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%