Deepanshu Gupta 8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev ...

Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d

2014-06-04 12:43:01 -07:00

api

am 7ab7f538: Hide new location APIs and undeprecate old ones

2012-11-01 15:27:23 -07:00

cmds

Update the content shell command's usage instructions.

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

core

am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

2014-05-13 17:40:49 +00:00

data

reduce camera sound volume.

2012-10-22 16:26:14 -07:00

docs

Doc change: fix typo in tablet guidelines.

2013-04-24 19:33:46 -07:00

drm

…

graphics

Doc fix: update BitmapFactory.Options.inSampleSize javadoc

2013-02-22 11:45:17 -05: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

Avoid tesselation path when useCenter is set

2012-11-01 11:27:03 -07:00

location

Hide new location APIs and undeprecate old ones

2012-11-01 15:22:22 -07:00

media

resolved conflicts for merge of 534f3e94 to jb-mr1-dev

2014-03-20 10:27:58 -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

…

opengl/java

GLSurfaceView defaults to 888 instead of 565

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

packages

Import translations. DO NOT MERGE

2012-11-16 14:10:37 -08:00

policy

Fix FLAG_DISMISS_KEYGUARD not working

2014-04-01 12:10:54 -07:00

samples/training/network-usage

…

sax

…

services

am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

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

telephony/java

Merge "Refactor Cell Location public API." into jb-mr1-dev

2012-09-23 15:44:30 -07:00

test-runner

Load resources for the correct user

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

tests

Fix image processing test to include all benchmark tests

2013-01-14 11:19:16 -08:00

tools

resolved conflicts for merge of 61fb5784 to jb-mr1-dev

2014-06-04 12:43:01 -07:00

voip

…

wifi/java/android/net/wifi

am fe38ff8d: DO NOT MERGE Sanitize WifiConfigs

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

Android.mk

Revert "makefile changes for gcm javadocs"

2013-02-12 21:39:28 +00:00

CleanSpec.mk

Port ImageProcessing to Filterscript.

2012-10-12 14:50:49 -07: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%