Katie McCormick c5b47cff88 resolved conflicts for merge of 7f9a0535 to jb-mr1-dev ...

Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd

2012-11-12 10:07:09 -08:00

api

Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev

2012-11-01 18:06:35 -07:00

cmds

Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev

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

core

Merge "Remove extraneous logs." into jb-mr1-dev

2012-11-08 13:16:10 -08:00

data

reduce camera sound volume.

2012-10-22 16:26:14 -07:00

docs

resolved conflicts for merge of 7f9a0535 to jb-mr1-dev

2012-11-12 10:07:09 -08:00

drm

…

graphics

Fix for bug 7400445 regression in background drawable

2012-10-31 13:59:02 -07:00

icu4j

…

include

…

keystore

…

libs

Avoid tesselation path when useCenter is set

2012-11-01 11:27:03 -07:00

location

Hide new location APIs and undeprecate old ones

2012-11-01 15:22:22 -07:00

media

Merge "audio service: make dock audio is off by default" into jb-mr1-dev

2012-10-29 15:21:33 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Import translations. DO NOT MERGE

2012-11-09 09:56:53 -08:00

policy

Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev

2012-11-08 16:36:56 -08:00

samples/training/network-usage

…

sax

…

services

When in vibrate mode, all notifications will vibrate.

2012-11-10 14:35:02 -05:00

telephony/java

…

test-runner

…

tests

Properly show emoji in the notification ticker.

2012-10-19 13:38:11 -04:00

tools

Add mechanism to kick keyguard to show the assistant

2012-11-08 00:39:04 -08:00

voip

…

wifi/java/android/net/wifi

Fix handling escaped chars in ssid

2012-10-29 10:01:38 -07:00

Android.mk

…

CleanSpec.mk

Port ImageProcessing to Filterscript.

2012-10-12 14:50:49 -07: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%