Jorim Jaggi 584a7aa62c resolved conflicts for merge of ff0978fd to master-lockscreen-dev ...

Change-Id: I03881da30db8189005d50812e5528ed07cebd437

2014-04-10 23:34:07 +02:00

api

Merge "Adding render stats APIs to UiAutomation (framework)."

2014-04-10 19:32:59 +00:00

cmds

am 9f777008: am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs."

2014-04-09 14:06:14 +00:00

core

am dcb495ff: Merge "Camera2 API: enable burst capture and repeating burst."

2014-04-10 19:54:58 +00:00

data

am d89929db: am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev

2014-03-25 21:36:39 +00:00

docs

am f403d60f: am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs

2014-04-05 22:45:01 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00

graphics

Cleaning up VectorDrawable

2014-04-10 11:21:15 -07:00

include

am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

2014-04-09 14:06:10 +00:00

keystore

Use the correct package name for CHOOSER

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

libs

Merge hasFunctors & pushStaging into prepareTree

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

location

Injected settings no longer include summaries

2014-03-03 10:30:36 -08:00

media

Camera2: Fix the JPEG format issues

2014-04-09 18:51:38 +00:00

native

am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"

2014-04-05 09:05:50 +00:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""

2014-03-06 14:12:35 -08:00

packages

resolved conflicts for merge of ff0978fd to master-lockscreen-dev

2014-04-10 23:34:07 +02:00

policy

Protect WindowManager's PRIVATE_FLAG_KEYGUARD

2014-04-09 21:07:04 +02:00

rs

am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

2014-04-01 00:24:57 +00: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 6be2f952 to master-lockscreen-dev

2014-04-10 12:48:07 -07:00

telephony/java

am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."

2014-03-28 17:40:52 +00:00

test-runner

Expand install observer semantics

2014-03-27 12:37:47 -07:00

tests

Cleaning up VectorDrawable

2014-04-10 11:21:15 -07:00

tools

resolved conflicts for merge of 6be2f952 to master-lockscreen-dev

2014-04-10 12:48:07 -07:00

wifi/java/android/net/wifi

Merge "Revert "Refactor IpConfiguration from WifiConfiguration""

2014-04-07 09:01:43 +00:00

Android.mk

Merge "Adding render stats APIs to UiAutomation (framework)."

2014-04-10 19:32:59 +00:00

CleanSpec.mk

Initial round of Television Input Framework

2014-04-08 13:35:21 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove non-existent classes from preloaded-classes

2014-02-27 13:51:00 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%