Jason Simmons f445a77bf3 resolved conflicts for merge of d053554f to jb-mr1-aah-dev ...

Change-Id: I8540083f7fd04e252c8879475f247ea6bbde8159

2012-09-21 10:38:01 -07:00

api

am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev

2012-09-20 12:51:05 -07:00

cmds

Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev

2012-09-11 13:56:04 -07:00

core

resolved conflicts for merge of d053554f to jb-mr1-aah-dev

2012-09-21 10:38:01 -07:00

data

Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family

2012-09-18 15:37:43 -07:00

docs

am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB

2012-09-19 11:27:42 -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 "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev

2012-09-18 18:43:52 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

Make input system aware of multiple displays.

2012-09-10 15:48:47 -07:00

keystore

Remove AndroidKeyStore from API

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

libs

Add support for QCOM_tiled_rendering

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

location

Require ACCESS_FINE_LOCATION for Geofence use.

2012-09-13 14:17:41 -07:00

media

Merge "Add multi user volume management" into jb-mr1-dev

2012-09-20 11:18:17 -07:00

native

Merge "Add support for "-rtl" in resources" into jb-mr1-dev

2012-09-04 15:01:03 -07:00

nfc-extras

Fix BasicNfcEeTest java package.

2011-12-09 14:35:32 -08:00

obex

Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex

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

opengl/java

Rename UserId to UserHandle.

2012-08-16 12:46:38 -07:00

packages

Import translations. DO NOT MERGE

2012-09-20 16:01:23 -07:00

policy

Update keyguard selector view to match UX design spec

2012-09-19 20:47:37 -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 f6e24d62: Merge "Remove pointless exception supression." into jb-mr1-dev

2012-09-20 12:51:09 -07:00

telephony/java

am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"

2012-09-11 13:21:38 -07:00

test-runner

More multi-user methods in PM

2012-09-08 19:14:00 -07:00

tests

Merge "Add tests for pass-by-value kernels." into jb-mr1-dev

2012-09-20 09:55:25 -07:00

tools

Update preloaded-classes for JB-MR1

2012-09-19 13:32:21 -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

Merge "send connection broadcast on client disconnect" into jb-mr1-dev

2012-09-18 15:26:16 -07:00

Android.mk

More multi-user stuff.

2012-09-15 23:58:55 -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

Update preloaded-classes for JB-MR1

2012-09-19 13:32:21 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%