Gabriel Peal 70054d15df am db0dca82: resolved conflicts for merge of c1edfc2c to master ...

* commit 'db0dca826d992af1adfa53e10c31f08d3197bb0b':
  resolved conflicts for merge of c1edfc2c to master

2014-03-25 23:00:43 +00:00

api

Unhide touch feedback drawable and wrapper

2014-03-24 19:54:34 -07:00

cmds

am a3633c25: am 71a3d40d: am e4360c8e: am 4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"

2014-03-20 21:05:40 +00:00

core

am 2d72d000: Merge "resolved conflicts for merge of 74fb97de to master"

2014-03-25 23:00:13 +00:00

data

am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev

2014-03-08 05:43:12 +00:00

docs

docs: Added new sensor types. Bug: 10674725

2014-03-24 15:24:43 -07:00

drm

…

graphics

Merge "Fix doc build"

2014-03-25 18:08:30 +00:00

include

resolved conflicts for merge of 92860a74 to master

2014-03-10 10:57:05 +00:00

keystore

Use the correct package name for CHOOSER

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

libs

Merge "Move where updateProperties is called"

2014-03-25 17:46:18 +00:00

location

Injected settings no longer include summaries

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

media

Begin refactor of MediaFocusControl

2014-03-25 10:47:58 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

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

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

packages

am c9b0d582: Merge "Fixing issue where we were relaunching each activity from recents instead of bringing them to the front."

2014-03-25 22:59:36 +00:00

policy

Implement APIs for obtaining, caching themed Drawables

2014-03-24 18:00:26 -07:00

rs

am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"

2014-03-19 21:22:06 +00:00

samples/training/network-usage

…

sax

…

services

am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown."

2014-03-24 21:25:37 +00:00

telephony/java

resolved conflicts for merge of c1edfc2c to master

2014-03-25 13:39:55 -07:00

test-runner

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

tests

Fix broken tests to fix build

2014-03-19 18:42:31 -04:00

tools

Fix build.

2014-03-24 14:53:39 -07:00

wifi/java/android/net/wifi

am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev

2014-03-21 00:45:42 +00:00

Android.mk

resolved conflicts for merge of 74fb97de to master

2014-03-25 11:08:19 -07:00

CleanSpec.mk

Added accessibility APIs for introspecting interactive windows.

2014-03-20 16:52:59 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%