Xavier Ducrohet b7de2194d5 resolved conflicts for merge of c71c678e to master ...

Change-Id: I9e1a6a1151af00f0a13e2010776276b240e0ac3a

2013-01-15 16:41:29 -08:00

api

Allow supplying extras when assigning QuickContactsBadge

2013-01-14 11:38:39 -08:00

cmds

Merge jb-mr1-dev into aosp/master - do not merge

2012-11-27 08:21:11 -08:00

core

Merge "Attempt to resolve build breakage on x86"

2013-01-15 14:58:29 -08:00

data

Merge "Turn off execute bit for ordinary media files"

2012-12-17 12:12:40 -08:00

docs

am f37d9c07: am b78714b5: am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages.

2013-01-15 09:37:04 -08:00

drm

Move stream creation outside of DrmOutputStream.

2012-12-17 17:04:16 -08:00

graphics

Add YUV allocation creation.

2013-01-08 15:29:41 -08:00

icu4j

…

include

Rename ISurfaceTexture and SurfaceTexture

2012-12-18 11:22:21 -08:00

keystore

am 834b0f3c: am 19b17b41: am 38a642e9: am 3e2479dd: Merge "docs: fix broken links and add new sitemap text file" into jb-mr1-dev

2013-01-03 18:44:22 -08:00

libs

Preliminary Support for region clipping

2013-01-14 14:27:54 -08:00

location

New "app ops" service.

2013-01-09 12:47:47 -08:00

media

Merge "Optimize media button stack traversal for remote volume"

2013-01-11 11:30:30 -08:00

native

Fix typo

2012-12-19 11:21:38 +08:00

nfc-extras

NfcAdapterExtras: expose driver name.

2012-10-03 14:14:23 -07:00

obex

…

opengl/java

DdmServer: add controls for OpenGL tracing

2012-12-19 16:31:56 -08:00

packages

port system ui over to new ICU date formatting API.

2013-01-15 17:14:48 -05:00

policy

port system ui over to new ICU date formatting API.

2013-01-15 17:14:48 -05:00

samples/training/network-usage

…

sax

…

services

fix NPE in updateClientUids

2013-01-15 10:39:28 -08:00

telephony/java

am c6e41cf2: am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes"

2013-01-03 15:21:52 -08:00

test-runner

New "app ops" service.

2013-01-09 12:47:47 -08:00

tests

am cfa979b2: am b88564d2: am 12798957: am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev

2013-01-14 15:14:43 -08:00

tools

resolved conflicts for merge of c71c678e to master

2013-01-15 16:41:29 -08:00

voip

am 9813e365: am 940ad4aa: Merge "Make AudioGroup.add locale safe"

2012-11-30 12:56:01 -08:00

wifi/java/android/net/wifi

Merge "Fix build"

2013-01-15 10:13:53 -08:00

Android.mk

New "app ops" service.

2013-01-09 12:47:47 -08:00

CleanSpec.mk

Refactoring of the screen magnification feature.

2012-12-14 16:27:27 -08: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%