Elliott Hughes b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp ...

Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6

2013-06-28 16:50:13 -07:00

api

am 324993ab: am 5216f11e: Merge "Track libcore API update."

2013-06-28 16:26: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

resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:50:13 -07:00

data

Fix up device sounds.

2013-05-28 21:44:29 -07:00

docs

am 6d324c82: am f285a709: Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev

2013-06-24 12:12:50 -07:00

drm

…

graphics

Improve RS documentation.

2013-06-05 11:28:45 -07:00

include

Rewrite input handling for native applications

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

keystore

resolved conflicts for merge of fca0f92e to stage-aosp-master

2013-06-28 16:41:19 -07:00

libs

Fix out of range glCopyTexImage2D

2013-06-27 17:15:24 -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 07d6d9e7: Merge "additional documentation for media codec info" into jb-mr2-dev

2013-06-14 17:08:33 -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 16a2268f: am e6304a9c: Merge "When a new user AID is generated, dump it to dropbox" into jb-mr2-dev

2013-06-28 10:14:30 -07:00

policy

Merge "Fix regression in long-press home behavior on tablets." into jb-mr2-dev

2013-06-05 22:00:58 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:50:13 -07:00

telephony/java

am 7334d25e: am 34fb4eae: Merge "Fix misspelling of getLteSignalStrenght."

2013-06-21 12:15:54 -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 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev

2013-06-26 10:55:00 -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

Allow carrier provisioning to turn toggle radio power.

2013-06-10 10:10:42 -07:00

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%