Svetoslav Ganov 7510e4820b resolved conflicts for merge of a7f38925 to master ...

Change-Id: If0e3a1046dfeef9260284e84f2a74525ddea00f7

2012-10-11 17:49:28 -07:00

api

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

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

cmds

am 572286b4: 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:17:09 -07:00

core

am e0fec434: am 1cf5bd2a: am 26e3f3df: Merge "Database cleanup needs to happen for all users." into jb-mr1-dev

2012-10-11 17:18:42 -07:00

data

Merge "Revert "Updating Roboto fonts with updated Cyrillic glyphs and fixes to tabular numerals. Bug:7198855,7070912"" into jb-mr1-dev

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

docs

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

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

am b97bf6c4: am ab01a9e4: am b2d55225: Merge "Add DAG validation for ScriptGroups." into jb-mr1-dev

2012-10-10 17:42:41 -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 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

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

am 8c17d23e: am 09a4a4c2: am 092ad66a: Merge changes Ic860de75,I8b2d6c7a into jb-mr1-dev

2012-10-11 17:18:29 -07:00

policy

Merge "Final keyguard tablet layout integration" into jb-mr1-dev

2012-10-11 11:08:19 -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

resolved conflicts for merge of a7f38925 to master

2012-10-11 17:49:28 -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 "Update the location tracker test app"

2012-10-09 16:14:15 -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

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

update pdk docs build target

2012-10-09 11:22:44 -07:00

CleanSpec.mk

add cleanspec.

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