The Android Open Source Project 5871434ed6 Reconcile with jb-mr2-release - do not merge ...

Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60

2013-06-03 14:02:50 -07:00

api

am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev

2013-05-30 18:00:08 -07:00

cmds

am d43a71da: Merge "Help for the debugging help for issue #8734824." into jb-mr2-dev

2013-05-06 16:48:16 -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

Fix up device sounds.

2013-05-28 21:44:29 -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

…

graphics

Fix free after use with createFromBitmapResource

2013-05-31 14:01:04 -07:00

include

Rewrite input handling for native applications

2013-04-22 17:01:51 -07:00

keystore

am cd1de394: Merge "Track change in NativeCrypto"

2013-05-06 15:13:58 -07:00

libs

Restore previous alpha value on noop'd DisplayList operations

2013-05-23 07:57:17 -07:00

location

am 39069b6e: am efb3726c: am 2b8f3734: am e3c549fc: am cd70c873: Merge "Android U: Making Apps Location-Aware" into jb-mr1.1-docs

2013-05-13 23:36:58 -07:00

media

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

2013-06-03 08:46:20 -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

…

obex

…

opengl/java

Add android.opengl.EGLExt class for EGL extensions

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

packages

am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev

2013-05-28 21:37:59 -07:00

policy

Merge "Fix keyguard issue where an incoming SMS would switch widget" into jb-mr2-dev

2013-05-31 21:41:34 +00:00

samples/training/network-usage

…

sax

…

services

am 05caa2a3: Apply scan-always setting to initial wifi state.

2013-06-03 08:41:48 -07:00

telephony/java

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

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

test-runner

…

tests

am 4e0ae8d6: Merge "Make sure the app is still app after launching. Bug:8755950" into jb-mr2-dev

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

tools

am 417e512b: Merge "Add missing native methods." into jb-mr2-dev

2013-05-24 13:53:44 -07:00

wifi/java/android/net/wifi

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

2013-06-01 08:58:16 -07:00

Android.mk

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

2013-05-22 18:00:28 -07:00

CleanSpec.mk

…

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

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%