Narayan Kamath 7f9a9bc7bf resolved conflicts for merge of e9febcc0 to master ...

Resolved with "-s ours" because this change has already
been cherry-picked to master.

2014-01-28 20:09:22 +00:00

api

am 065d998a: Merge "Hide an old debug function." into klp-modular-dev

2014-01-28 00:13:12 +00:00

cmds

Merge "sqlite integer fields are long"

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

core

AArch64: Make graphics classes 64-bit compatible

2014-01-28 10:02:43 +00: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 ddef0ec9: am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs

2014-01-22 05:56:16 +00:00

drm

Remove unused imports from frameworks/base.

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

graphics

AArch64: Make graphics classes 64-bit compatible

2014-01-28 10:02:43 +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 "Native-side proxy"

2014-01-28 00:45:44 +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

Import translations. DO NOT MERGE

2014-01-27 09:56:24 -08: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

am af17925f: am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibility state not sync between ActivityManager and WindowManager"

2014-01-28 18:19:50 +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 "Add "throws IOException" to MediaCodec factory methods"

2014-01-21 23:03:33 +00:00

tools

Track 64bit changes to android/graphics.

2014-01-28 10:06:40 +00:00

wifi/java/android/net/wifi

Move Wifi/P2p service components under services

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

Android.mk

resolved conflicts for merge of b7bba718 to master

2013-12-19 10:55:17 -08: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%