Filip Gruszczynski 5e4c382d15 resolved conflicts for merge of 17ba2e6c to mnc-dev ...

Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0

2015-06-08 15:00:25 -07:00

api

Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev

2015-06-08 20:17:23 +00:00

cmds

Merge "Adding am send-trim-memory command" into mnc-dev

2015-06-05 23:37:15 +00:00

core

Merge "Update documentation of CARRIER_PRESENCE & bitmasks." into mnc-dev

2015-06-08 20:29:14 +00:00

data

Move NotoSansSymbols higher than CJK in the fallback chain.

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

docs

am edaf008c: am b0ebbc86: Merge "Revert "docs: studio 1.2.2.0 updates"" into mnc-preview-docs

2015-06-06 00:06:25 +00:00

drm

…

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 "Remove deprecated android.security.KeyStore methods." into mnc-dev

2015-06-08 18:11:21 +00:00

libs

Merge "Add projection info to RenderNode dumps" into mnc-dev

2015-06-08 20:00:37 +00:00

location

CountryDetector no longer requires location permissions.

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

media

Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev

2015-06-08 19:37:36 +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

Cleanup Bitmap JNI attempt #2

2015-03-05 13:56:16 -08:00

packages

Merge "QS: Handle font-size changes immediately in ZenModePanel." into mnc-dev

2015-06-08 21:03:57 +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

…

services

resolved conflicts for merge of 17ba2e6c to mnc-dev

2015-06-08 15:00:25 -07:00

telecomm/java

Add telecom extra to specify handle for incoming call

2015-06-05 16:00:12 -07:00

telephony/java

Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev

2015-06-08 20:05:07 +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

Merge "Use VoiceInteractor.Prompt in VoiceInteraction test app" into mnc-dev

2015-06-08 20:03:39 +00:00

tools

AAPT2: Add manifest merging

2015-06-04 18:00:33 -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 "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev

2015-06-08 19:37:36 +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%