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

Change-Id: Id080dc52375e30cfad7c1b6df9be754c2bb8c6fa

2013-05-17 12:54:33 -07:00

api

am 50ab525a: Merge "Add route description API." into jb-mr2-dev

2013-05-17 12:44:37 -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 50ab525a: Merge "Add route description API." into jb-mr2-dev

2013-05-17 12:44:37 -07:00

data

Add DPad keys to Playpad

2013-04-26 15:06:38 -07:00

docs

am ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page

2013-05-16 20:45:47 -07:00

drm

…

graphics

Merge "Fix bug #8858012 layer-list's bitmap item's start/end gravity is incorrect on RTL under certain conditions" into jb-mr2-dev

2013-05-13 18:18:17 +00:00

include

…

keystore

am cd1de394: Merge "Track change in NativeCrypto"

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

libs

Fix off by one error in log tracking

2013-05-09 17:00:46 -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 50ab525a: Merge "Add route description API." into jb-mr2-dev

2013-05-17 12:44:37 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

Add android.opengl.EGLExt class for EGL extensions

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

packages

am 11184922: Merge "Fix battery level quick settings tile bug." into jb-mr2-dev

2013-05-10 15:39:04 -07:00

policy

Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev

2013-05-10 00:03:56 +00:00

samples/training/network-usage

…

sax

…

services

am c12783a9: Add min delay between disable and enable of wifi

2013-05-16 14:02:49 -07:00

telephony/java

Enhance TelephonyManger javadocs.

2013-04-25 15:02:34 -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 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

2013-05-07 16:05:58 -07:00

wifi/java/android/net/wifi

am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev

2013-05-13 14:13:50 -07:00

Android.mk

am 05002977: Merge "Include support library resource modules when building docs." into jb-mr2-dev

2013-05-13 17:35:21 -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%