Jason Monk 057ee76e5c Fix build ...

Fix bad merge

Change-Id: I2cd1f32a7e50b8fa1f7f85c52fe34111f7cea577

2016-01-11 14:37:44 -05:00

api

Merge "Implement surfaceRedrawNeeded for GLSurfaceView"

2016-01-11 19:18:25 +00:00

cmds

Adjusting AMN#requestBugReport() to be able to invoke 3 types

2016-01-08 17:50:16 +00:00

core

Fix build

2016-01-11 14:37:44 -05:00

data

Merge "Replace Qaae script with Zsye"

2016-01-05 21:54:29 +00:00

docs

docs: removed duplicate "Synctrace" definition.

2015-12-11 09:04:25 -08:00

drm

Discourage use of "_data" column.

2016-01-06 10:19:35 -07:00

graphics

Merge "Deprecate mCancel in BitmapFactory.Options API"

2016-01-08 15:47:32 +00:00

include

Avoid matching system locales in locale negotiation

2016-01-04 13:53:54 -08:00

keystore

Return null on getPrivateKey failure not exception

2015-12-21 12:09:20 +00:00

libs

Unclipped savelayer support in new renderer

2016-01-08 16:05:35 -08:00

location

Make Location objects take less memory.

2015-10-27 18:09:53 -07:00

media

Merge "Add setMasterMono and getMasterMono"

2016-01-08 23:17:56 +00:00

native

am ef9e04b2: am 66f5affb: Merge "Fix bug number for linker related workarounds"

2015-09-28 18:28:22 +00:00

nfc-extras

…

obex

OBEX: Handle GET operation properly

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

opengl/java

Implement surfaceRedrawNeeded for GLSurfaceView

2016-01-08 15:13:54 -08:00

packages

Move battery saver notification to QS

2016-01-11 14:29:23 -05:00

rs

Various fixes in setting globals in a script group

2015-11-13 10:00:12 -08:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

Merge "Fix WebView loading logic to allow changing provider if current disabled"

2016-01-11 18:43:05 +00:00

telecomm/java

Merge "Add a new property PROPERTY_WORK_CALL"

2016-01-06 12:25:14 +00:00

telephony/java

Add methods to the API to retrieve voicemail notification settings.

2016-01-06 11:14:42 -08:00

test-runner

Even more PackageManager caller triage.

2016-01-08 18:35:54 -07:00

tests

Merge "Remove graphics-related RenderScript tests." am: 766e20506c

2016-01-07 22:09:56 +00:00

tools

Merge "AAPT2: Warn when positional arguments exist and --legacy is on"

2016-01-11 18:44:58 +00:00

wifi/java/android/net/wifi

resolve merge conflicts of 8c79fe5dc4 to master.

2015-12-29 15:09:09 -08:00

Android.mk

Use different asset when docked stack exists

2016-01-05 13:49:41 +01:00

CleanSpec.mk

AudioService: remove dead code

2015-11-23 23:16:04 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove merge markers from preloaded-classes

2015-12-02 11:32:22 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%