Deepanshu Gupta 51cce0ec42 resolve conflicts for merge 5a7b3b65 correctly ...

Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84

2014-05-12 19:31:25 -07: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 ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev

2014-04-18 18:14:32 +00:00

data

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

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

docs

am 8dd6275e: Android Training: Multiple Threads

2012-12-19 10:31:39 -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

Add new ASSIST key and map it to the global assist intent.

2012-06-14 04:16:26 -07:00

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 a3337bc7: Merge "Verify certificates" into jb-dev

2014-03-20 10:04:23 -07:00

native

libnativehelper is implicitly available.

2012-05-03 16:39:22 -07:00

nfc-extras

Fix BasicNfcEeTest java package.

2011-12-09 14:35:32 -08:00

obex

Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex

2012-04-06 14:04:31 -07:00

opengl/java

Improve GLSurfaceView Pausing.

2012-04-16 12:25:36 -07:00

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 fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

2014-04-07 19:36:54 +00: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

resolve conflicts for merge 5a7b3b65 correctly

2014-05-12 19:31:25 -07:00

voip

Make SimpleSessionDescription locale safe

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

wifi/java/android/net/wifi

am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

2014-04-07 19:36:54 +00:00

Android.mk

Create telephony-common and mms-common - DO NOT MERGE

2012-07-17 12:23:09 -07:00

CleanSpec.mk

Telephony: Move AdnRecord.aidl into opt/telephony

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

MODULE_LICENSE_APACHE2

…

NOTICE

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

preloaded-classes

Update preloaded-classes for JB

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

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%