Kenny Root ed3ce513a6 Fix bad merge ...

Change-Id: I9f05f96e3607b994368a8d4e1e454af8fe84424d

2012-10-17 10:06:17 -07:00

api

am cccf85c2: am 8e614501: Merge "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-16 19:28:28 -07:00

cmds

Fix bad merge

2012-10-17 10:06:17 -07:00

core

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

2012-10-17 10:02:22 -07:00

data

Merge "Add new tablet sound set Bug: 7351672" into jb-mr1-dev

2012-10-16 10:28:38 -07:00

docs

am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications

2012-10-12 14:17:03 -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 c894029a: am be29d82f: Merge "Correctly adjust clip regions that lie offscreen" into jb-mr1-dev

2012-10-17 07:57:04 -07:00

location

Prevent overflow in LocationRequest.setExpireIn()

2012-10-04 13:40:08 -07:00

media

Merge "Use device availability to start WFD audio routing" into jb-mr1-dev

2012-10-15 16:24:56 -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

Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex

2012-04-06 14:04:31 -07:00

opengl/java

GLSurfaceView defaults to 888 instead of 565

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

packages

Hide settings button from tablet notification panel.

2012-10-17 01:11:05 -04:00

policy

Merge "Stopping Face Unlock immediately on detaching from window fixes 7338808" into jb-mr1-dev

2012-10-16 17:44:53 -07:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

…

services

am 6facef70: am b6c171b1: Merge "Do cleanup when Stopping users" into jb-mr1-dev

2012-10-16 21:45:59 -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 136bd7c6: am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-dev

2012-10-15 15:19:50 -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

Fix NPE

2012-10-16 13:24:19 -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

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

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%