The Android Open Source Project f63ee450b4 am dddeb53f: (-s ours) Reconcile with jb-mr1-release - do not merge ...

* commit 'dddeb53fd61c76b4e2f694f77c67ce821feef74f':

2012-11-01 07:54:51 -07:00

api

am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev

2012-10-29 13:43:14 -07:00

cmds

More changes to fix PDK build:

2012-10-24 12:31:10 -07:00

core

am 33185d4f: am f1e32af5: am c86e8dff: Merge "Fix WiFi stress test" into jb-mr1-dev

2012-10-31 21:26:11 -07:00

data

Audio assets at 48000 Hz

2012-10-23 16:34:21 -07:00

docs

am 463d9557: am 81f05833: am 05728277: am c6df397e: am a76f1dfc: am c7255569: Merge "Doc change: fix broken link in publishing steps TOC." into jb-dev-docs

2012-10-30 17:14:53 -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 06da2423: am 54385d91: am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev

2012-10-31 16:41:59 -07:00

icu4j

…

include

More changes to fix PDK build:

2012-10-24 12:31:10 -07:00

keystore

Remove AndroidKeyStore from API

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

libs

Merge "More changes to fix PDK build:"

2012-10-24 12:34:21 -07:00

location

Merge "DO NOT MERGE suggest LocationRequest rather than Criteria" into jb-mr1-dev

2012-10-30 13:26:38 -07:00

media

Merge "Remove obsolete references to libmedia_native"

2012-10-30 12:12: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

GLSurfaceView defaults to 888 instead of 565

2012-09-18 15:36:10 -07:00

packages

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-10-31 15:02:31 -07:00

policy

am 345c0fa0: am 40d90211: am c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev

2012-10-31 20:39:48 -07:00

samples/training/network-usage

…

sax

…

services

am 0ed9f7d7: am 4af84142: am fe28ff0d: Merge "Fix for regression in WindowManager orientation changes" into jb-mr1-dev

2012-10-31 16:55:34 -07:00

telephony/java

Merge "Refactor Cell Location public API." into jb-mr1-dev

2012-09-23 15:44:30 -07:00

test-runner

Remove erroneous override of package-private method.

2012-10-24 14:51:21 -07:00

tests

am d1ccf94b: am 694722da: am cc0106cd: Merge "Properly show emoji in the notification ticker." into jb-mr1-dev

2012-10-22 08:24:16 -07:00

tools

Merge "Enhance AIDL to take an explicit id for methods"

2012-10-19 10:34:10 -07:00

voip

Remove obsolete references to libmedia_native

2012-10-30 10:59:52 -07:00

wifi/java/android/net/wifi

am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev

2012-10-29 14:12:19 -07:00

Android.mk

update pdk docs build target

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

CleanSpec.mk

Audio assets at 48000 Hz

2012-10-23 16:34:21 -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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%