Chris Wren a35f8ce39f am 061a4de8: Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev ...

* commit '061a4de86d79d3ead3f297fa3fde4692446af5e4':
  resolve conflicting assumptions from the merge.

2012-10-11 13:08:28 -07:00

api

am b8021a88: Merge "Fix bug #7326778 Rename LayoutParams.onResolveLayoutDirection(int)" into jb-mr1-dev

2012-10-10 17:29:52 -07:00

cmds

am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev

2012-10-09 19:13:13 -07:00

core

am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev

2012-10-11 12:10:02 -07:00

data

Add new ringtones/notifications for Occam.

2012-10-11 12:10:41 -07:00

docs

am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev

2012-10-10 16:09:41 -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 DAG validation for ScriptGroups." into jb-mr1-dev

2012-10-10 17:35:12 -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

Prevent possible divide by 0

2012-10-10 17:13:36 -07:00

location

Prevent overflow in LocationRequest.setExpireIn()

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

media

Merge "Don't play notifications during speech recognition" into jb-mr1-dev

2012-10-10 16:30: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

…

opengl/java

GLSurfaceView defaults to 888 instead of 565

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

packages

Merge "resolve conflicting assumptions from the merge." into jb-mr1-dev

2012-10-11 13:05:36 -07:00

policy

Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev

2012-10-11 12:07:38 -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 d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev

2012-10-11 11:39:36 -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

Adds showWhenLocked attribute to Activities.

2012-10-06 13:09:58 -07:00

tools

am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-dev

2012-10-07 11:50:54 -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 build

2012-10-09 17:13:37 -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

add cleanspec.

2012-09-20 09:12:43 -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%