Scott Main 783e115b60 resolved conflicts for merge of e907a390 to jb-dev-plus-aosp ...

Change-Id: I4e216b81f33b4b7c238f74f1c475bc84df3f79ef

2012-11-14 19:04:05 -08:00

api

Deprecate those parts of DateUtils the documentation says not to use.

2012-09-14 16:06:50 -07:00

cmds

am e583bcf1: Merge "Explicitly set lib dir permissions during unlink" into jb-dev

2012-07-31 09:34:26 -07:00

core

am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs

2012-11-13 14:22:58 -08:00

data

am 5f61087e: Merge "Get rid of LOCAL_MODULE_TAGS := user"

2012-08-17 00:48:03 -07:00

docs

am 22cc2764: implement new organization for Training classes This also moves a few of the documents from API Guides > Best Practices into the new courses for best practices. This is also dependent on CL Ieac8a97a8d6fda41a3682241901150cfe16afc4d which generates the lis

2012-11-14 17:38:15 -08:00

drm

Release JNI local references as soon as possible.

2012-08-17 15:59:35 -07:00

graphics

DO NOT MERGE - Fix readback lengths

2012-08-17 18:24:07 -07:00

icu4j

…

include

…

keystore

Remove useless TestRunner

2012-08-10 13:40:19 -07:00

libs

am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering"

2012-09-11 17:57:19 -07:00

location

DO NOT MERGE. Add package-name-prefix blacklist for location updates.

2012-07-30 13:17:30 -07:00

media

am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"

2012-09-18 10:53:11 -07:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am e445c258: Merge "Fix notification gestures." into jb-dev

2012-09-11 21:30:49 -07:00

policy

am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on"

2012-08-14 19:31:55 -07: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 64d1f3ef: DO NOT MERGE - Full (local) restore security changes

2012-09-28 11:32:15 -07:00

telephony/java

Show plmn in emergency call allowed mode.

2012-09-12 16:46:41 -07:00

test-runner

docs: fix broken links

2012-08-06 18:04:23 -07:00

tests

am b8da225f: Merge "Tests/RS: Add RS context check for RsBalls setAccel()"

2012-08-21 14:00:11 -07:00

tools

am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge.

2012-10-18 17:48:57 -07:00

voip

Make SimpleSessionDescription locale safe

2012-08-29 08:21:05 +02:00

wifi/java/android/net/wifi

am 48c45d0e: Merge "Fix join scenario with provision discovery"

2012-08-29 10:49:20 -07:00

Android.mk

…

CleanSpec.mk

Telephony: Move AdnRecord.aidl into opt/telephony

2012-08-03 16:47:51 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Update preloaded-classes for JB

2012-08-12 19:46:51 +09:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%