The Android Open Source Project 5196cb6fa0 Reconcile with jb-mr1.1-release - do not merge ...

Change-Id: Ib7a3e7b3af9ef848b763cf498c6757ad5658fc80

2012-11-29 15:41:04 -08:00

api

am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into jb-mr1-dev

2012-11-01 19:15:46 -07:00

cmds

am de0bf8bc: am abb4a700: Update the content shell command\'s usage instructions.

2012-11-27 11:31:21 -08:00

core

am ed8c323a: am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev

2012-11-29 14:28:24 -08:00

data

am dbcdb1a8: am a9c0bb4a: Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev

2012-11-16 14:12:19 -08:00

docs

am 8569af30: am 5915f61e: am 830b23b7: docs: gms javadocs

2012-11-29 14:28:59 -08:00

drm

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

graphics

am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev

2012-11-28 11:31:40 -08:00

icu4j

…

include

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

keystore

Switch keystore to binder

2012-11-14 08:45:52 -08:00

libs

am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev

2012-11-29 14:26:33 -08:00

location

am 4b77660b: am 7023b3b0: Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev

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

media

am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev

2012-11-29 14:26:57 -08:00

native

am 768d9e1a: Merge "Correct executable bit for source files"

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

am a8a63dd7: am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev

2012-11-29 14:28:07 -08:00

policy

am 1428384c: am 958343c1: Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev

2012-11-29 14:28:15 -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

am 418af932: am 05db19bc: Merge "trigger kernel blocked stack trace on system server watchdog" into jb-mr1.1-dev

2012-11-29 14:28:33 -08:00

telephony/java

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

test-runner

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

tests

am 70f17822: am 54525d8e: Merge "Clean up the Builder test." into jb-mr1.1-dev

2012-11-27 18:21:35 -08:00

tools

am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt

2012-11-29 10:58:26 -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

Fixed typo and space.

2012-11-16 16:59:36 +09:00

Android.mk

add api level 17 to javadoc filter and update version number

2012-09-28 12:12:59 -07:00

CleanSpec.mk

Port ImageProcessing to Filterscript.

2012-10-12 14:50:49 -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%