Deepanshu Gupta 9f00e655db resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev ...

Change-Id: I6d3a92e8d3853069c1d8cb3399d6dfcb5b58da83

2014-05-13 10:55:56 -07:00

api

Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-dev

2012-11-01 18:06:35 -07:00

cmds

Update the content shell command's usage instructions.

2012-11-26 09:50:51 -08:00

core

Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

2014-05-04 13:31:10 -07:00

data

Play a tone when wireless charging begins.

2012-12-11 12:55:03 -08:00

docs

Merge "Doc change: Update gcore reference docs." into jb-mr1.1-docs

2013-07-12 00:50:59 +00:00

drm

Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev

2012-08-22 14:50:27 -07:00

graphics

Doc update: fix incorrect enum

2013-03-28 16:14:08 -07:00

icu4j

…

include

Handle multi-user mountObb() requests.

2012-09-25 17:34:48 -07:00

keystore

docs: fix broken links and add new sitemap text file

2013-01-03 18:02:21 -08:00

libs

Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale

2012-12-12 11:52:03 -08:00

location

Android U: Making Apps Location-Aware

2013-05-13 20:50:22 -07:00

media

am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

2014-03-20 10:47:34 -07:00

native

Handle multi-user mountObb() requests.

2012-09-25 17:34:48 -07:00

nfc-extras

NfcAdapterExtras: expose driver name.

2012-10-03 14:14:23 -07:00

obex

Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex

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

opengl/java

GLSurfaceView defaults to 888 instead of 565

2012-09-18 15:36:10 -07:00

packages

Don't update global table when upgrading secondary users' database.

2012-12-12 09:52:26 -08:00

policy

am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working

2014-04-01 19:18:36 +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

am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

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

telephony/java

Enable Turkish language encoding for Turkish SIM cards.

2012-12-06 14:53:44 -08:00

test-runner

Load resources for the correct user

2012-09-25 15:45:27 -07:00

tests

am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev

2013-01-14 15:00:38 -08:00

tools

resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

2014-05-13 09:49:18 -07:00

voip

am f66603e1: am 3f3ce8ad: am bf3e62b8: Merge "Make SimpleSessionDescription locale safe"

2012-09-06 11:51:53 -07:00

wifi/java/android/net/wifi

am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

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

Android.mk

Doc change: delete legacy intl dir and update toc's for devsite-compatible lang strings.

2013-05-06 18:38:24 -07:00

CleanSpec.mk

Fix sample code issues

2012-11-30 12:32:36 -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%