The Android Open Source Project fdb2213db4 am 3fbf896c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge ...

* commit '3fbf896c1f194c37bb49d753d7f30367a9a9c43f':
  Maybe fix issue #9296868: Crash in system process
  Fix regression in long-press home behavior on tablets.
  Import translations. DO NOT MERGE
  Create missing Uids when recording network stats.
  Import translations. DO NOT MERGE

2013-06-06 10:38:59 -07:00

api

Merge "Fix CrossFade transition"

2013-06-06 17:37:10 +00:00

cmds

Convert API refs to StackBox from ActivityStack.

2013-05-24 16:12:57 -07:00

core

Merge "Fix CrossFade transition"

2013-06-06 17:37:10 +00: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 38bdf107: am 57394e3d: am 2fbe1094: am 3ef445a8: am 68291f33: am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs

2013-06-05 18:33:38 -07:00

drm

Add liblog

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

graphics

Merge "Deprecate DrawableStateList.getChildren() and add getChild()."

2013-06-06 17:36:40 +00:00

include

libutils clean-up

2013-05-07 17:09:46 -07:00

keystore

Track change in NativeCrypto

2013-05-07 00:44:18 -07:00

libs

Remove string allocations when creating display lists

2013-06-05 14:14:03 -07:00

location

Make com.android.location.provider visible to apps-only build.

2013-05-20 15:08:14 -07:00

media

am e125116f: am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev

2013-06-04 11:17:14 -07:00

native

am 09377ddb: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event"

2013-05-28 17:08:54 -07:00

nfc-extras

Clean up dist files.

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

obex

Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex

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

opengl/java

Add android.opengl.EGLExt class for EGL extensions

2013-05-01 13:46:58 -07:00

packages

Import translations. DO NOT MERGE

2013-06-03 09:45:51 -07:00

policy

Merge "Extend stacks up under status bar"

2013-06-06 00:28:20 +00: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 "Extend stacks up under status bar"

2013-06-06 00:28:20 +00:00

telephony/java

am aafed1df: add link to required permission from ACTION_RESPOND_VIA_MESSAGE

2013-06-04 19:38:23 -07:00

test-runner

Add API to retrieve cursor notification URI.

2013-05-15 15:39:47 -07:00

tests

Fix CrossFade transition

2013-06-06 07:37:32 -07:00

tools

Fix a bug resolving the correct icon/logo in action bars

2013-05-31 15:00:24 -07:00

wifi/java/android/net/wifi

am 66c7bd54: am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev

2013-06-01 09:52:18 -07:00

Android.mk

am 6c5b9799: am 1fa3cdf0: Merge "Move offline-pdk to where the source is." into jb-mr2-dev

2013-05-22 18:03:01 -07:00

CleanSpec.mk

New NotificationListenerService.

2013-04-05 19:54:44 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

2013-04-29 23:09:03 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%