Adrian Roos f8bddb4840 Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 am: d70126ec78 ...

am: c67191508b

* commit 'c67191508bb0ab195696fedd3e173c9b37488084':
  Fix bad one-line MessagingStyle

Change-Id: I96b15a9c1121f8c9be257722380ded5235bd5a93

2016-05-28 00:32:56 +00:00

api

Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev am: 5b11a81f9f

2016-05-28 00:26:15 +00:00

cmds

…

core

Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 am: d70126ec78

2016-05-28 00:32:56 +00:00

data

…

docs

Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43

2016-05-27 21:45:46 +00:00

drm

…

graphics

Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'

2016-05-27 20:05:56 +00:00

include

…

keystore

…

libs

…

location

…

media

Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d am: 29e8879307" into nyc-mr1-dev-plus-aosp

2016-05-27 17:14:11 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Move Xerox recommendation plugin to service."

2016-05-28 00:28:08 +00:00

proto

resolve merge conflicts of cd9ea74 to nyc-mr1-dev am: 7ee8418076

2016-05-27 23:35:34 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev am: 2c69d1ecae am: 85e60d203e

2016-05-28 00:32:52 +00:00

telecomm/java

…

telephony/java

resolve merge conflicts of 4c04097 to nyc-mr1-dev

2016-05-26 23:13:17 +00:00

test-runner

…

tests

Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'

2016-05-27 20:05:56 +00:00

tools

…

wifi/java/android/net/wifi

…

Android.mk

…

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%