Narayan Kamath dfd1aa4331 resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp ...

Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2

2014-01-31 12:57:24 +00:00

api

Hide an old debug function.

2014-01-24 13:10:19 -08:00

cmds

…

core

resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp

2014-01-31 12:57:24 +00:00

data

…

docs

am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs

2014-01-30 22:10:50 +00:00

drm

AArch64: Use long for pointers in DRM classes

2014-01-17 14:38:25 +00:00

graphics

am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"

2014-01-29 12:18:31 +00:00

include

AssetManager cookies should be int32_t and not void*.

2014-01-27 11:20:24 +00:00

keystore

…

libs

am 30e20ac5: am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."

2014-01-27 12:07:15 +00:00

location

…

media

am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compatible"

2014-01-28 19:18:40 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"

2014-01-29 15:42:34 +00:00

policy

…

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 2cd0563c to klp-modular-dev-plus-aosp

2014-01-31 12:57:24 +00:00

telephony/java

…

test-runner

…

tests

…

tools

am 70986e19: am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"

2014-01-31 12:17:09 +00:00

wifi/java/android/net/wifi

…

Android.mk

…

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%