Andreas Gampe 1b4e56ac36 resolved conflicts for merge of 1d67698b to master ...

Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b

2015-03-13 00:17:40 -07:00

api

Merge "Add API for WebView OffscreenPreRaster setting."

2015-03-13 00:38:47 +00:00

cmds

Add new debug feature to automatically create heap dumps.

2015-03-06 16:42:03 -08:00

core

resolved conflicts for merge of b6b9fe21 to master

2015-03-13 00:04:10 -07:00

data

Move Noto Sans Tai Le to the end of the font fallback list.

2015-03-12 15:45:32 +00:00

docs

am 93d44992: am 1a27a3fb: am 46005888: am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs

2015-03-13 06:33:26 +00:00

drm

Frameworks/base: Wall Werror in drm

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

graphics

Implement bounded ripple animation

2015-03-09 18:54:25 -07:00

include

Add DEPTH image formats, support in ImageReader

2015-03-09 16:42:25 -07:00

keystore

am f271fa33: am cdc70256: am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore"

2015-02-24 04:54:41 +00:00

libs

Merge "Enforce null-termination in ResStringPool::stringAt"

2015-03-12 21:17:50 +00:00

location

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

media

Merge "Volume policy updates."

2015-03-13 00:59:34 +00:00

native

am 3b9cfe30: am a6ed1b95: am 6e116429: Merge "Generate gnu hash for arm only"

2015-03-11 20:09:17 +00:00

nfc-extras

…

obex

…

opengl/java

Cleanup Bitmap JNI attempt #2

2015-03-05 13:56:16 -08:00

packages

Volume policy updates.

2015-03-12 13:57:08 -04:00

rs

am bb8c910f: am d2e4a166: Merge "Remove dead path code"

2015-03-13 02:59:40 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 1d67698b to master

2015-03-13 00:17:40 -07:00

telecomm/java

Hide calllog entries for unregistered phone accounts

2015-03-03 00:33:35 +00:00

telephony/java

Merge "Add methods for device telephony configs."

2015-03-06 01:05:08 +00:00

test-runner

Fix some javadocs typos

2015-03-02 07:07:05 -08:00

tests

Add generic "INTERACTION" event type to UsageStatsManager

2015-03-02 12:54:14 -08:00

tools

am a4277e14: am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev

2015-03-13 06:33:44 +00:00

wifi/java/android/net/wifi

Change WiFi and Bluetooth ActivityEnergyInfo classes

2015-03-09 15:28:29 -07:00

Android.mk

Merge "Add ChooserTargetService API"

2015-03-05 00:07:53 +00:00

CleanSpec.mk

Clean-up stale inputflinger binaries and associated libs.

2015-02-24 12:11:37 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Manually add SignalStrength to preloaded-classes

2015-03-04 21:56:26 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%