The Android Open Source Project e382d4da24 am 5871434e: (-s ours) Reconcile with jb-mr2-release - do not merge ...

* commit '5871434ed6cb00895bba1bc253dcbfc49c453041':

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

api

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

2013-06-01 00:07:05 +00:00

cmds

Convert API refs to StackBox from ActivityStack.

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

core

am 0c2c62b2: Merge "Fix awkward wording in AppWidgetManager docs." into jb-mr2-dev

2013-06-03 08:52:56 -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 3c080baa: am 564889b1: am 4a024be4: am 4cef8150: Merge "update dashbord for 6/3" into jb-mr1.1-ub-dev

2013-06-03 11:35:02 -07:00

drm

Add liblog

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

graphics

am d19068a7: am 413adc92: Merge "Fix free after use with createFromBitmapResource" into jb-mr2-dev

2013-06-01 09:51:46 -07: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

Re-initialize the 9patch cache if cleared with onTrimMemory

2013-05-28 14:32:01 -07:00

location

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

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

media

am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev

2013-06-03 08:48:30 -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

am 2542fd54: am 00d4c946: Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev

2013-06-01 09:51:40 -07:00

policy

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

2013-05-31 15:00:24 -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 53009832: am 05caa2a3: Apply scan-always setting to initial wifi state.

2013-06-03 08:43:58 -07:00

telephony/java

am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"

2013-06-01 08:23:02 -07:00

test-runner

Add API to retrieve cursor notification URI.

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

tests

Fix build; update framework tests for WindowManager API change

2013-05-31 17:39:20 -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

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

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

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%