Andrei Stingaceanu 15f4dd7219 resolved conflicts for merge of 1c96a941 to mnc-ub-dev ...

Change-Id: I37613fa8fc8ff0d91c8cc2f8c389326c30a6b297

2015-06-10 15:46:44 +01:00

api

Merge "Make peer LLCP version an int." into mnc-dev

2015-06-10 06:58:20 +00:00

cmds

Flags to select storage volume for app installs.

2015-06-09 21:42:22 -07:00

core

resolved conflicts for merge of 1c96a941 to mnc-ub-dev

2015-06-10 15:46:44 +01:00

data

Move NotoSansSymbols higher than CJK in the fallback chain.

2015-06-04 15:39:43 -07:00

docs

am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java Also fix links to samples and reference docs." into mnc-preview-docs

2015-06-09 23:10:21 +00:00

drm

Frameworks/base: Wall Werror in drm

2014-11-10 17:23:02 -08:00

graphics

Merge "Implement getColorFilter() on VectorDrawable" into mnc-dev

2015-06-06 00:26:04 +00:00

include

Add -round and -notround qualifier to android runtime/aapt

2015-05-15 15:10:58 -07:00

keystore

Merge "Switch Android Keystore key gen and import to new KeyStore API." into mnc-dev

2015-06-09 20:17:44 +00:00

libs

Merge "Upload bitmaps in SkShader* safely" into mnc-dev

2015-06-09 22:32:33 +00:00

location

CountryDetector no longer requires location permissions.

2015-05-21 16:29:40 -07:00

media

Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev

2015-06-10 01:04:50 +00:00

native

Add -round and -notround qualifier to android runtime/aapt

2015-05-15 15:10:58 -07:00

nfc-extras

…

obex

OBEX: Handle GET operation properly

2015-05-16 01:19:19 +00:00

opengl/java

Add tracing to GLSurfaceView

2015-06-08 17:40:00 -07:00

packages

am 5b7793ca: Merge "Expand scrim all the way to the right" into mnc-dev

2015-06-10 01:40:51 +00:00

rs

Merge "Fixed ScriptGroup for outputs to globals" into mnc-dev

2015-06-05 22:43:27 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

Merge "Flags to select storage volume for app installs." into mnc-dev

2015-06-10 04:43:18 +00:00

telecomm/java

Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev

2015-06-09 22:04:10 +00:00

telephony/java

Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev

2015-06-09 22:04:10 +00:00

test-runner

Add API to hint whether to show on-board UI before a permission request.

2015-06-02 14:48:38 -07:00

tests

Fix issue #21621920: VI: need mechanism to get current request

2015-06-09 14:15:49 -07:00

tools

AAPT2: Proguard rules generation added.

2015-06-09 11:14:24 -07:00

wifi/java/android/net/wifi

Fail sanity check when BSSID is empty in RTT request

2015-06-05 15:37:51 -07:00

Android.mk

Merge changes from topic 'modemActivityInfo' into mnc-dev

2015-06-08 23:44:51 +00:00

CleanSpec.mk

Revert "Initial draft of new MediaRouter APIs."

2015-05-06 16:02:21 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Move Android Keystore impl to android.security.keystore.

2015-05-13 16:17:40 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%