frameworks_base

Go to file

Jason Monk 5dbe4afebe Merge "QS: Fix single expanded frame from layout" into nyc-dev am: 4215ae0100 am: 023b338111

am: e5b5c11743

* commit 'e5b5c11743f53d70dda78d7fd4f8a728a3c1bc3c':
  QS: Fix single expanded frame from layout

Change-Id: If4e5828a662d2d326e447f31f36ecea5a6280a19

2016-06-01 23:43:51 +00:00

api

Merge "Fix build breakage due to res-id changes" into nyc-mr1-dev am: 8c5578bcb0

2016-05-28 01:00:25 +00:00

cmds

…

core

Merge "Revert "Merge "Add 900 for Russia - Short code used by Sberbank.""" am: 56bd06fc3e am: ce82f1c16a am: be718d8836

2016-06-01 23:39:32 +00:00

data

…

docs

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

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

drm

…

graphics

Merge "Copy native tree's property when mutate vector drawable"

2016-05-28 01:11:23 +00:00

include

…

keystore

…

libs

Merge "HWUI: do nothing in case of empty layer" into nyc-dev am: 21a608f27f am: 6544a0e2e2

2016-06-01 00:45:15 +00:00

location

…

media

resolve merge conflicts of d579be0 to nyc-dev-plus-aosp am: 4c3d43d2c2

2016-06-01 23:39:39 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "QS: Fix single expanded frame from layout" into nyc-dev am: 4215ae0100 am: 023b338111

2016-06-01 23:43:51 +00:00

proto

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

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

…

samples/training/network-usage

…

sax

…

services

Merge "PackageManager: Don\'t clear app profiles during system upgrades." into nyc-dev am: 93193135b1 am: 41846b0612

2016-06-01 23:18:42 +00:00

telecomm/java

…

telephony/java

…

test-runner

…

tests

Correct valueType attribute for an AVD in test app

2016-06-01 13:38:03 -07:00

tools

…

wifi/java/android/net/wifi

WifiManager: Add new API's for backup/restore

2016-05-31 13:36:38 -07:00

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%