Nick Kralevich 6643ea823b resolved conflicts for merge of 011132a7 to jb-mr1-dev ...

Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb

2012-11-30 10:23:56 -08:00

api

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

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

cmds

Update the content shell command's usage instructions.

2012-11-26 09:50:51 -08:00

core

resolved conflicts for merge of 011132a7 to jb-mr1-dev

2012-11-30 10:23:56 -08:00

data

…

docs

Merge "docs: gms and gcm javadocs" into jb-mr1-dev

2012-11-30 09:56:48 -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

…

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Import translations. DO NOT MERGE

2012-11-16 14:10:37 -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

Notification vibration improvements: [DO NOT MERGE]

2012-11-19 15:12:24 -08:00

telephony/java

…

test-runner

…

tests

…

tools

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08:00

voip

…

wifi/java/android/net/wifi

…

Android.mk

…

CleanSpec.mk

…

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%