Deepanshu Gupta bd28e2d9d3 Manual merge of changes from klp-dev ...

Manually merged the following changes from klp-dev branch and fixed
merge conflicts:
78cfdf31b7c48589ea3a148ec1d6d573235bc06b
d0581d271e814670d81a6550aa7b1e86864d5710
1f92d7fc0ffa72d7db93244c29a1a6575bb4b318
0baec410c29206dc72d9f5afba5d45827e62c00c
24541255c312ee34f9bf17eb5852cdffd4807065

Change-Id: I426729bb90a26746bfff3a0e4a03ea9f37972528

2014-01-29 16:50:40 -08:00

api

Update reordering method names, and make 3d reordering API public

2014-01-29 13:55:39 -08:00

cmds

Merge "sqlite integer fields are long"

2014-01-08 22:22:27 +00:00

core

Fix build breakage

2014-01-29 15:30:50 -08:00

data

Merge "Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."""

2014-01-10 17:44:22 +00:00

docs

am 3e35a2c3: am 5a0b40d4: am f088add7: am 80cbc73f: am e535499e: Merge "add api notice to cast package index" into klp-docs

2014-01-29 12:49:51 +00:00

drm

am 38638b2f: am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"

2014-01-29 12:50:09 +00:00

graphics

Merge "Path.native_trim should return long, not int."

2014-01-29 15:48:11 +00:00

include

AssetManager cookies should be int32_t and not void*.

2014-01-27 10:31:11 -08:00

keystore

Remove unused imports from frameworks/base.

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

libs

Merge "Merge close vertices in a better way."

2014-01-29 23:45:12 +00:00

location

Remove unused imports from frameworks/base.

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

media

Merge "Fix invocation of notification callback in case the callback is modified"

2014-01-28 17:22:54 +00:00

native

Track Looper decoupling from ALooper

2013-12-18 17:56:35 -08:00

nfc-extras

…

obex

Fixed review comments

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

opengl/java

Merge "Fix incorrect name in eglSwapBuffers log wrapper"

2013-12-15 00:11:21 +00:00

packages

am 2ad24e74: am 15c09e1e: am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"

2014-01-29 15:52:15 +00:00

policy

am cd655f12: Merge "Fix broken homekey on devices without keyguard" into klp-modular-dev

2014-01-13 22:28:03 +00:00

rs

AArch64: Make graphics classes 64-bit compatible

2014-01-28 10:02:43 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

Merge "Adapt to underlying changes in the PBKDF2 implementation"

2014-01-29 21:42:58 +00:00

telephony/java

am 9bc74c4b: am ab092bb0: am 46988138: am 57756970: am a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug 7637224"

2014-01-16 00:06:02 +00:00

test-runner

am e014eb63: am fc6b772f: am bf6d0797: am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs

2014-01-16 00:47:37 +00:00

tests

Merge "Update reordering method names, and make 3d reordering API public"

2014-01-29 22:51:29 +00:00

tools

Manual merge of changes from klp-dev

2014-01-29 16:50:40 -08:00

wifi/java/android/net/wifi

Move Wifi/P2p service components under services

2013-12-11 16:06:49 -08:00

Android.mk

Adding the print and accessibility pacelables to framework.aidl

2014-01-28 23:00:14 +00:00

CleanSpec.mk

am 9158825f: Move some system services to separate directories

2013-12-19 23:30:35 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Move GLES20DisplayList functionality into DisplayList

2013-12-20 13:53:50 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%