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

* commit 'a35f8ce39ff86e8ad1ce905ba58112d7e2f8684a':
  resolve conflicting assumptions from the merge.

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

api

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

2012-10-10 17:32:47 -07:00

cmds

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

2012-10-09 19:14:24 -07:00

core

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

2012-10-11 17:11:50 -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

…

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

…

libs

am 21ff8c9c: am 1460c8ca: Merge "Prevent possible divide by 0 Bug #7307304" into jb-mr1-dev

2012-10-10 17:21:07 -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

…

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

…

sax

…

services

am d3e5180f: am d07fa6e0: Merge "Prevent out of range magnification scale to be persisted." into jb-mr1-dev

2012-10-11 17:11:37 -07:00

telephony/java

…

test-runner

…

tests

Adds showWhenLocked attribute to Activities.

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

tools

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

2012-10-07 11:53:43 -07:00

voip

…

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

…

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%