The Android Open Source Project 6b0693a318 am 8f4e09d2: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge ...

* commit '8f4e09d2a8213d64edacc081879aaadd56b961bc':

2013-07-11 10:17:23 -07:00

api

am f445a685: am 0b18c149: am 0f50cb31: Merge "Fix build."

2013-07-11 10:17:12 -07:00

cmds

Merge "Single-user restrictions"

2013-06-26 23:04:32 +00:00

core

am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master

2013-07-11 10:16:46 -07:00

data

am 17486b97: am ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev

2013-05-28 22:59:24 -07:00

docs

am c4570b32: am 29282f99: am b1b693ee: am 5e0582cc: am 7cf27aa8: Merge "update url for backup service key bug: 8834302" into jb-mr1.1-ub-dev

2013-07-09 10:58:43 -07:00

drm

Add liblog

2013-04-09 21:54:12 -07:00

graphics

Merge "Minor fixes to android.graphics.Matrix"

2013-07-10 16:44:40 +00:00

include

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

keystore

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

libs

Use global references for Bitmap AndroidPixelRefs

2013-07-08 11:08:02 -07:00

location

Use FastPrintWriter... everywhere.

2013-06-24 18:16:48 -07:00

media

ImageReader: get correct jpeg size.

2013-07-01 11:03:41 -07:00

native

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

…

opengl/java

Merge "Fix wrapper equals()"

2013-06-24 17:42:25 +00:00

packages

am dff4ec87: am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master

2013-07-11 10:16:46 -07:00

policy

Remove debug logging.

2013-07-01 13:47:49 -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 7e0fad1d: am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev

2013-07-11 08:08:18 -07:00

telephony/java

Merge commit '3b5d686e' into fix-merge-conflict

2013-07-01 16:12:31 -07:00

test-runner

Single-user restrictions

2013-06-25 16:03:55 -07:00

tests

Fix minor transition bugs

2013-07-10 12:14:54 -07:00

tools

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

wifi/java/android/net/wifi

Flush scan results et al after band change

2013-07-09 10:42:38 -07:00

Android.mk

Initial camera device implementation

2013-06-26 13:19:45 -07:00

CleanSpec.mk

Headphones volume warning disabled by default

2013-07-03 17:59:03 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Enable preloading of the appropriate WebView.

2013-06-19 15:03:08 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%