Kenny Root 9396f183c2 resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp ...

Change-Id: I21512d61b5c08cee5fed69b34c3275ba5c3fc0d8

2012-10-19 17:16:41 -07:00

api

am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev

2012-10-18 21:07:52 -07:00

cmds

resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

2012-10-19 17:16:41 -07:00

core

resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

2012-10-19 17:16:41 -07:00

data

New camera sounds

2012-10-18 19:03:20 -07:00

docs

am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface

2012-10-18 12:31:05 -07:00

drm

Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev

2012-08-22 14:50:27 -07:00

graphics

Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev

2012-10-16 19:05:49 -07:00

icu4j

…

include

Handle multi-user mountObb() requests.

2012-09-25 17:34:48 -07:00

keystore

Remove AndroidKeyStore from API

2012-09-14 16:23:37 -07:00

libs

am eb78cf53: am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev

2012-10-19 10:45:41 -07:00

location

LocationManager permissions cleanup

2012-10-18 09:13:39 -07:00

media

More migration to Global settings.

2012-10-18 15:38:14 -07:00

native

Handle multi-user mountObb() requests.

2012-09-25 17:34:48 -07:00

nfc-extras

NfcAdapterExtras: expose driver name.

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

obex

…

opengl/java

GLSurfaceView defaults to 888 instead of 565

2012-09-18 15:36:10 -07:00

packages

Merge changes Ie3c8ca8d,Ia175b36d into jb-mr1-dev

2012-10-19 16:37:55 -07:00

policy

More migration to Global settings.

2012-10-18 15:38:14 -07:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

2012-10-19 17:16:41 -07:00

telephony/java

Merge "Refactor Cell Location public API." into jb-mr1-dev

2012-09-23 15:44:30 -07:00

test-runner

Load resources for the correct user

2012-09-25 15:45:27 -07:00

tests

Merge "Add API to enable mipmaps on Bitmap Bug #7353771" into jb-mr1-dev

2012-10-16 19:05:49 -07:00

tools

am 26d76606: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev

2012-10-18 15:32:57 -07:00

voip

am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

2012-09-06 11:51:53 -07:00

wifi/java/android/net/wifi

am 61e42262: Fix group join CTS test

2012-10-19 12:40:40 -07:00

Android.mk

add api level 17 to javadoc filter and update version number

2012-09-28 12:12:59 -07:00

CleanSpec.mk

Port ImageProcessing to Filterscript.

2012-10-12 14:50:49 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Do not preload videoeditor_jni since it breaks the emulator

2012-09-24 10:34:42 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%