Michael Wright 889814cee0 resolved conflicts for merge of 32912e0a to stage-aosp-master ...

Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26

2014-05-19 22:42:58 -07:00

api

DO NOT MERGE: Mark new util type functions as @hide in AOSP.

2014-01-31 14:05:20 -08:00

cmds

am c4c08803: Merge "app_process: change app_process a symlink of primary version"

2014-05-15 09:41:40 +00:00

core

resolved conflicts for merge of 32912e0a to stage-aosp-master

2014-05-19 22:42:58 -07:00

data

am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."

2014-05-02 19:16:16 +00:00

docs

am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2

2014-03-25 21:54:09 +00:00

drm

AArch64: Use long for pointers in DRM classes

2014-01-17 14:38:25 +00:00

graphics

am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."

2014-05-14 23:51:59 +00:00

include

DO NOT MERGE Add DrawGlInfo kModeProcessNoContext

2014-05-01 15:51:41 -07:00

keystore

Add argument to binder call to check key types

2013-09-05 13:27:00 -07:00

libs

am b1708e9b: Merge "Use alpha channel instead of red in drawCachedGlyphBitmap"

2014-05-19 19:27:52 +00:00

location

Improve some javadoc related to isProviderEnabled() apis

2013-09-11 11:03:03 -07:00

media

am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

2014-05-08 00:21:38 +00:00

native

AArch64: Make AssetManager and related classes 64-bit compatible

2014-01-31 14:14:29 +00:00

nfc-extras

Clean up dist files.

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

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.

2014-04-15 05:11:58 +08:00

packages

am a84d24c3: Merge "Extend support for nordic languages with Sami"

2014-05-19 18:19:20 +00:00

policy

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

rs

am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."

2014-05-08 00:21:38 +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

am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."

2014-05-19 13:29:57 +00:00

telephony/java

am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

2014-05-01 17:57:51 +00:00

test-runner

docs: Fixed typo in InstrumentationTestRunner page.

2014-01-14 12:47:34 -08:00

tests

am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

2014-03-16 17:31:32 +00:00

tools

am f1f28d1d: Merge "Skip resource files for locales en-XA and ar-XB during packaging if pseudolocalization was done automatically. This prevents attemts to add same resource twice."

2014-05-06 02:27:44 +00:00

wifi/java/android/net/wifi

am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev

2014-03-21 00:45:59 +00:00

Android.mk

am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

2014-03-22 23:41:43 +00:00

CleanSpec.mk

Refactor how the print dialog activity is started.

2013-10-11 09:11:24 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Removed android.debug.JNITest from preloaded-classes

2014-03-24 20:21:04 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%