Justin Koh fc986d71ca resolved conflicts for merge of 32c5f299 to master ...

Change-Id: I72656792e109fea82c63a3a42151c024630f5997

2014-05-13 16:52:17 -07:00

api

resolved conflicts for merge of 32c5f299 to master

2014-05-13 16:52:17 -07:00

cmds

am 516130cc: am dbbf431b: am d0f7f418: Merge "Freeing frame map"

2014-04-30 17:36:10 +00:00

core

resolved conflicts for merge of 32c5f299 to master

2014-05-13 16:52:17 -07:00

data

am e8628797: am 09446329: am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."

2014-05-02 22:15:06 +00:00

docs

am 4472b649: am 7ce3b5ef: am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs

2014-05-13 17:45:22 +00:00

drm

Fix a few more stray libcore.io references.

2014-04-28 20:49:24 -07:00

graphics

Merge "Remove the group tag."

2014-05-12 22:41:43 +00:00

include

DO NOT MERGE Add DrawGlInfo kModeProcessNoContext

2014-05-01 15:51:41 -07:00

keystore

Use the correct package name for CHOOSER

2014-03-17 16:21:56 -07:00

libs

Merge "Clamp to uint8 for alpha"

2014-05-13 21:59:36 +00:00

location

Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.

2014-04-25 11:39:16 -07:00

media

Merge "Make sessions aware of user id"

2014-05-12 21:20:49 +00:00

native

Bug fix for wakeup sensors.

2014-04-23 17:05:41 -07:00

nfc-extras

…

obex

…

opengl/java

am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

2014-04-21 19:49:40 +00:00

packages

New quick settings implementation.

2014-05-13 18:43:40 -04:00

policy

am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev

2014-05-13 20:41:38 +00:00

rs

am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

2014-05-08 18:31:18 +00:00

samples/training/network-usage

…

sax

…

services

Merge "New quick settings implementation."

2014-05-13 22:45:42 +00:00

telephony/java

Replace LinkCapabilities with NetworkCapabilities

2014-05-12 16:52:56 -07:00

test-runner

Cleaning code related to the forwarding intent filters.

2014-05-06 13:54:48 +01:00

tests

Merge "Remove the group tag."

2014-05-12 22:41:43 +00:00

tools

am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

2014-05-13 21:43:52 +00:00

wifi/java/android/net/wifi

Replace LinkCapabilities with NetworkCapabilities

2014-05-12 16:52:56 -07:00

Android.mk

Usage stats!

2014-05-08 13:58:13 -07:00

CleanSpec.mk

Make GET_TASKS signature|system.

2014-05-02 11:51:26 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove VideoEditor

2014-04-21 16:11:51 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%