Marco Nelissen faab8b2313 Fix build ...

Bad automerge

Change-Id: I000a9d3ac2915b3e39d2d34bd52062ac47e9f0fe

2014-03-06 22:19:02 -08:00

api

Merge "Add Path.isConvex, and force View outlines to be convex"

2014-03-06 18:18:59 +00:00

cmds

Merge "FramebufferNativeWindow.h is obsolete"

2014-03-06 15:30:51 +00:00

core

am 9550ac44: am d7b5caab: am da9a956b: Merge "Fix Theme.Micro to not request ActionBar." into klp-modular-dev

2014-03-07 03:10:08 +00:00

data

am 78e208ac: am 6b661fdc: am dd9f7cb2: Add Odie KL file.

2014-03-06 02:57:18 +00:00

docs

am 4c4160a0: am b0a6241b: am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

2014-03-04 08:25:29 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00

graphics

am 92a32832: DO NOT MERGE - Fix Javadoc build break.

2014-03-06 21:31:31 +00:00

include

am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

2014-03-05 20:09:52 +00:00

keystore

KeyChain: add explicit package for getPrivateKey

2014-02-07 09:14:32 -08:00

libs

Make sure we register functor count

2014-03-06 16:22:47 -08:00

location

Injected settings no longer include summaries

2014-03-03 10:30:36 -08:00

media

Fix build

2014-03-06 22:19:02 -08:00

native

Cleanup unnecessary includes for libskia.

2014-02-27 16:21:24 +00:00

nfc-extras

…

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""

2014-03-06 14:12:35 -08:00

packages

Add icons for display adjustment quick settings

2014-03-06 18:36:43 -08:00

policy

Manually merge commit '2faf28cf' into master

2014-03-04 15:25:43 -08:00

rs

am edf0b79d: am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."

2014-03-06 02:29:06 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

Fix issue #11536426 DO NOT MERGE

2014-03-06 10:12:57 -08:00

telephony/java

Add get/setPreferredNetworkType() for OMA DM client.

2014-03-03 13:27:20 -08:00

test-runner

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

tests

am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev

2014-03-05 22:17:21 +00:00

tools

am 4bd720c2: am a05e7526: am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot."

2014-03-06 00:59:15 +00:00

wifi/java/android/net/wifi

Merge "Add new API to scan a given channel set"

2014-02-27 03:12:06 +00:00

Android.mk

Hold a wake lock while dispatching network activity events.

2014-02-28 15:19:39 -08:00

CleanSpec.mk

Move Session apis to android.media.session

2014-02-25 16:01:55 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove non-existent classes from preloaded-classes

2014-02-27 13:51:00 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%