Nick Kralevich 2ce5173afb Merge commit '199f9655' into manualmerge ...

these files no longer exist in jb-mr2-dev, so this patch is useless.
Accept the version in jb-mr2-dev

2013-03-01 10:01:29 -08:00

api

Declare VOICE_ASSIST intent

2013-03-01 12:59:24 +00:00

cmds

am f7497c9e: am 755205ad: Merge "Fix spelling error s/SORT_OREDER/SORT_ORDER/ in "content --help""

2013-02-26 18:04:33 +00:00

core

am edb95c3f: am 937cfa77: Merge "ZygoteInit: use correct header files."

2013-03-01 17:41:53 +00:00

data

Camera and MediaRecorder: Support AppOps

2013-02-25 09:27:42 -08:00

docs

am 08a551b4: am f132ac4f: am ac6a76d2: am f19dd2b5: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev

2013-02-28 03:03:07 +00:00

drm

Move stream creation outside of DrmOutputStream.

2012-12-17 17:04:16 -08:00

graphics

Merge "Avoid trying to draw invisible ShapeDrawables" into jb-mr2-dev

2013-03-01 01:16:44 +00:00

include

clean-up following Surface split

2013-02-15 12:47:40 -08:00

keystore

KeyStore: stop using state()

2013-02-14 12:06:51 -08:00

libs

Merge "Support 3D rotations when drawing text" into jb-mr2-dev

2013-03-01 00:05:51 +00:00

location

Annotate Locations coming from mock providers

2013-01-22 09:39:47 -08:00

media

When scanning a single file, take .nomedia into account

2013-02-27 16:53:47 -08:00

native

Fix typo

2012-12-12 11:27:44 +08:00

nfc-extras

Add exception types for NfcEe operations.

2013-02-12 13:43:30 -08:00

obex

…

opengl/java

regenerate GLES java bindings

2013-02-25 16:48:44 -08:00

packages

am bf53be46: am 09353f74: Merge "Check and fail early if requested wallpaper size exceeds maximum texture size."

2013-02-27 07:08:15 +00:00

policy

Merge "Unify normal and overlay action bar layouts." into jb-mr2-dev

2013-02-28 22:14:48 +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 "Allow loopback traffic in lockdown mode." into jb-mr2-dev

2013-03-01 00:58:32 +00:00

telephony/java

Turn off debug in CellInfoLte.

2013-02-12 10:47:32 -08:00

test-runner

New ContentProvider initialization for testing.

2013-02-26 16:16:14 -08:00

tests

Merge "Support 3D rotations when drawing text" into jb-mr2-dev

2013-03-01 00:05:51 +00:00

tools

Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev

2013-02-26 01:08:28 +00:00

wifi/java/android/net/wifi

wifi: Add delimiter flag into bss scan results request

2013-03-01 09:37:00 -08:00

Android.mk

Initial version of BLE support for Bluedroid

2013-02-27 18:08:14 -08:00

CleanSpec.mk

Move a few files from frameworks/opt/telephony to frameworks/base.

2013-02-07 17:03:05 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Do not preload videoeditor_jni since it breaks the emulator

2012-09-24 10:34:42 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%