dmitrygr@google.com bfba77c005 am 026d35e4: am 90cfa001: (-s ours) resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp ...

* commit '026d35e49cc40a88ab135ac6994b7c57533bab79':
  DO NOT MERGE: change preloaded classes

2014-05-08 18:36:37 +00:00

api

am 3225a6b5: Further cleaning on animated part of VectorDrawable.

2014-05-08 17:40:09 +00:00

cmds

am c8a045d4: am 41f40581: Merge "Fix x86 build in app_process."

2014-05-01 10:43:23 +00:00

core

am 3225a6b5: Further cleaning on animated part of VectorDrawable.

2014-05-08 17:40:09 +00:00

data

am e8628797: am 09446329: am 52025796: Merge "Map KEY_APPSELECT to APP_SWITCH."

2014-05-02 22:15:06 +00:00

docs

am b5342f96: am fe997295: am 01dc133b: am f1bc39b8: fix code error. The data type was wrong, but it\'s actually not needed.

2014-05-07 00:00:20 +00:00

drm

Fix a few more stray libcore.io references.

2014-04-28 20:49:24 -07:00

graphics

Further cleaning on animated part of VectorDrawable.

2014-05-08 10:16:34 -07:00

include

am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

2014-04-09 14:06:10 +00:00

keystore

…

libs

Merge "Avoid caching shadow properties in Java & HWUI."

2014-05-08 14:41:47 +00:00

location

Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.

2014-04-25 11:39:16 -07:00

media

Fix javadoc reference in AudioTrack write modes

2014-05-08 17:01:40 +00:00

native

Bug fix for wakeup sensors.

2014-04-23 17:05:41 -07:00

nfc-extras

…

obex

…

opengl/java

am 43cea7ea: am 650a8860: am fc3c6a0e: Merge "EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested."

2014-04-21 19:49:40 +00:00

packages

Merge "Import translations. DO NOT MERGE"

2014-05-08 14:37:37 +00:00

policy

am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev

2014-05-06 20:24:23 +00:00

rs

Add flags to context creation for RS

2014-05-07 14:23:46 -07:00

samples/training/network-usage

…

sax

…

services

Fix Global Proxy when used with PAC

2014-05-08 13:46:26 -04:00

telecomm/java

Merge "Add toString to CallServiceDescriptor" into master-nova

2014-04-15 18:41:37 +00:00

telephony/java

am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

2014-05-01 18:07:58 +00:00

test-runner

Cleaning code related to the forwarding intent filters.

2014-05-06 13:54:48 +01:00

tests

Further cleaning on animated part of VectorDrawable.

2014-05-08 10:16:34 -07:00

tools

Encapsulate Canvas.mNativeCanvas

2014-05-06 21:07:19 -04:00

wifi/java/android/net/wifi

Initial implementation of WifiScanner

2014-05-07 21:14:24 -07:00

Android.mk

am c5fe3c17: Merge "Initial implementation of WifiScanner"

2014-05-08 08:45:04 +00:00

CleanSpec.mk

Make GET_TASKS signature|system.

2014-05-02 11:51:26 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove VideoEditor

2014-04-21 16:11:51 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%