Nick Kralevich 849f5188e3 am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev ...

* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
  Secure a handful of framework broadcasts

2012-11-30 10:35:44 -08:00

api

Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev

2012-11-01 18:06:35 -07:00

cmds

Update the content shell command's usage instructions.

2012-11-26 09:50:51 -08:00

core

am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev

2012-11-30 10:35:44 -08:00

data

grant shell user EXPAND_STATUS_BAR permission

2012-11-15 19:49:42 -08:00

docs

Merge "docs: gms and gcm javadocs" into jb-mr1-dev

2012-11-30 09:56:48 -08: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

Remove overzealous mutate() sanity check in LayerDrawable

2012-11-27 11:39:11 -08: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

Use the same interrupt/resume logic for all functor calls

2012-11-28 14:45:04 -08:00

location

clarify Geofence.createCircle() param ranges

2012-11-27 09:23:52 -08:00

media

Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev

2012-11-30 09:26:30 -08: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

Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev

2012-11-30 10:05:01 -08:00

policy

Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev

2012-11-30 07:27:36 -08: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

Merge "Don't apply transformation fudge when not rotating." into jb-mr1.1-dev

2012-11-29 17:53:47 -08:00

telephony/java

Remove unused IExtendedNetworkService

2012-11-29 12:52:51 -08:00

test-runner

Load resources for the correct user

2012-09-25 15:45:27 -07:00

tests

Merge "Clean up the Builder test." into jb-mr1.1-dev

2012-11-27 18:13:29 -08:00

tools

Cache resource ID lookups in aapt

2012-11-28 15:32:46 -08: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

Re-use existing thread

2012-11-07 13:02:08 -08:00

Android.mk

Remove unused IExtendedNetworkService

2012-11-29 12:52:51 -08:00

CleanSpec.mk

Remove unused IExtendedNetworkService

2012-11-29 12:52:51 -08: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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%