frameworks_base

Go to file

Jason Monk 71a7976e35 Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30

am: a58c1a52ac

* commit 'a58c1a52ac44a53175475f78cea074583ed5e177':
  QS: Protect against crash with no icon

Change-Id: I20c0c15d3e7358f056198280d8d9c2b0d9ca4115

2016-06-01 17:34:18 +00:00

api

Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev

2016-05-28 00:09:27 +00:00

cmds

…

core

Merge "MessagingStyle: Generate EXTRA_TITLE and EXTRA_TEXT" into nyc-dev am: ff39d3ec2f

2016-06-01 17:34:05 +00:00

data

…

docs

Updated image sizes and wrapped text around images. am: 1ce2279423

2016-05-31 18:45:36 +00:00

drm

…

graphics

Copy native tree's property when mutate vector drawable

2016-05-27 10:54:55 -07:00

include

…

keystore

…

libs

Merge "HWUI: do nothing in case of empty layer" into nyc-dev

2016-06-01 00:20:54 +00:00

location

…

media

Merge "media: avoid recursion when evaluating profile support" into nyc-dev

2016-06-01 01:05:30 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30

2016-06-01 17:34:18 +00:00

proto

resolve merge conflicts of cd9ea74 to nyc-mr1-dev

2016-05-27 13:34:02 -04:00

[RenderScript] Fix ScriptIntrinsicBlur documentation.

2016-05-25 14:44:10 -07:00

samples/training/network-usage

…

sax

…

services

Merge "Add an intent extra to force master clear" into nyc-mr1-dev

2016-06-01 17:20:43 +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

Un-deprecated Android mock testing APIs

2016-05-25 22:54:27 +00:00

tests

Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6

2016-05-27 03:46:30 +00:00

tools

…

wifi/java/android/net/wifi

…

Android.mk

…

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%