Craig Mautner efc81e7d5e resolved conflicts for merge of 75f31740 to lmp-dev ...

Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b

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

api

Add AudioAttributes support in the TTS.

2014-07-17 13:19:39 +01:00

cmds

Install sessions only inherit APK files.

2014-07-16 13:38:09 -07:00

core

Restrict SCORE_NETWORKS permission to signature|system.

2014-07-17 09:27:36 -07:00

data

Fix BCP47 language tags in fallback_fonts.xml

2014-07-10 22:57:51 +00:00

docs

am 1f4e5686: am 289d3c25: am fc8a3b5f: Merge "Doc Update: new Smack sample." into klp-modular-docs

2014-07-16 21:44:50 +00:00

drm

am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev

2014-06-10 01:30:05 +00:00

graphics

Add accessibility text contrast setting

2014-07-16 18:25:23 -07:00

include

am ce75618e: am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

2014-07-09 15:07:35 +00:00

keystore

Revert "Revert "Publish DevicePolicyManager CA certificate APIs""

2014-06-19 14:04:24 +00:00

libs

Add accessibility text contrast setting

2014-07-16 18:25:23 -07:00

location

Add support in the platform for Activity Recognition Hardware.

2014-07-11 15:58:36 -07:00

media

Merge "Pass input ID to the setup/settings activity" into lmp-dev

2014-07-17 04:18:22 +00:00

native

SkBitmap::Config is deprecated, use SkColorType

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

nfc-extras

…

obex

Bluetooth: Support MAP Client role on Bluedroid.

2014-07-01 18:01:27 +00:00

opengl/java

Fix onTrimMemory for HardwareRenderer

2014-06-30 16:36:26 -07:00

packages

Zen: Maintain selection throughout rocker session.

2014-07-17 12:09:05 -04:00

phone/java/android/phone

Some string cleanup.

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

policy

am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev

2014-07-17 10:55:43 +00:00

rs

Unhide RenderScript resize intrinsic

2014-07-10 15:10:42 -07:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

resolved conflicts for merge of 75f31740 to lmp-dev

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

telecomm/java

Add toString & equals helper methods to PhoneAccount.java

2014-07-17 01:21:23 +00:00

telephony/java

Messaging auto persist switch (1/4)

2014-07-16 10:39:21 -07:00

test-runner

Add code cache directory for apps.

2014-07-15 22:13:26 -07:00

tests

Implement issue #16330060: Inform ActivityManager about WebView...

2014-07-16 22:50:31 -07:00

tools

Use BlendComposite for advanced PorterDuff Modes. [DO NOT MERGE]

2014-07-16 19:53:38 +00:00

wifi/java/android/net/wifi

Introduce RTT Manager

2014-07-17 00:45:20 +00:00

Android.mk

Use the WebView's loader library to load the real library.

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

CleanSpec.mk

Move ICallService.aidl to IConnectionService.aidl

2014-07-08 04:15:55 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove WebView library preloading mechanism.

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

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%