Craig Mautner 532f732838 resolved conflicts for merge of 5c4b5ede to lmp-dev-plus-aosp ...

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: Id6ece6daa4a36dc8479f5bce867cce3b42b3ef70

2014-07-30 22:37:11 -07:00

api

Allow using third-party HTTP/... stacks for per-network URLs.

2014-07-31 02:17:28 +00:00

cmds

Add context to MediaController constructor

2014-07-28 11:02:15 -07:00

core

am 44551060: Allow using third-party HTTP/... stacks for per-network URLs.

2014-07-31 03:01:59 +00:00

data

Fix the glyph for U+3A34 in DroidSansFallbackFull.ttf.

2014-07-25 10:23:47 -07:00

docs

am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

2014-07-30 21:14:39 +00:00

drm

…

graphics

Support FontFeatureSettings in Paint

2014-07-30 21:38:23 +00:00

include

Merge "Add kModeSync" into lmp-dev

2014-07-24 20:48:02 +00:00

keystore

…

libs

Use RoundRect clipping for circle reveal animation

2014-07-30 17:15:50 +00:00

location

Expose Gps Navigation Messages in the platform.

2014-07-23 10:30:21 -07:00

media

Adds toString() in MediaBrowserItem

2014-07-30 15:36:25 -07:00

native

SkBitmap::Config is deprecated, use SkColorType

2014-07-08 15:05:38 -04:00

nfc-extras

…

obex

…

opengl/java

…

packages

am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev

2014-07-30 20:21:08 +00:00

phone/java/android/phone

Some string cleanup.

2014-07-10 19:20:29 +00:00

policy

am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev

2014-07-29 01:08:09 +00:00

rs

Fix broken blend intrinsic.

2014-07-10 13:00:10 -07:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 5c4b5ede to lmp-dev-plus-aosp

2014-07-30 22:37:11 -07:00

telecomm/java

Adding video width/height to camera capabilities.

2014-07-30 00:07:46 +00:00

telephony/java

Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.

2014-07-30 18:09:53 -07:00

test-runner

PackageInstaller changes based on feedback.

2014-07-25 11:59:48 -07:00

tests

Add shared library support to aapt dump

2014-07-30 21:53:48 +00:00

tools

Add shared library support to aapt dump

2014-07-30 21:53:48 +00:00

wifi/java/android/net/wifi

record join attempts

2014-07-29 12:33:12 -07:00

Android.mk

NFC Unlock api changes

2014-07-31 01:09:02 +00:00

CleanSpec.mk

Add getPackageName to MediaController

2014-07-25 16:22:59 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove WebView library preloading mechanism.

2014-07-17 09:18:43 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%