Deepanshu Gupta 03a057c1af Manual merge of changes from frameworks/base/tools ...

Manually merge of following changes:
9cb5f5b5233f2331748d108d71f4b685762f32a7
1cf5df38f4bdafa1beb2674ca548ad6d9650766b
083e3caf66c21f7cc9511db479726c38d90e2d2f
81f74f4bc96ea4266cebe1b785d095558f540800
39e75835399f4d979cf82069dae2bd1ec496fb81
272d1bce798a5fef42cc2ee31f629d00c89f66eb
45f5cd49fa898a59484edfd8e291dbe10df82db2

Change-Id: Ie21ca480ac117e16e28eb554474835b762ccb104

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

api

Hide android.os.Parcel.obtain(int).

2014-01-23 14:26:29 +00:00

cmds

Merge "sqlite integer fields are long"

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

core

Revert "AArch64: Make graphics classes 64-bit compatible"

2014-01-27 14:22:45 +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

Revert "AArch64: Make graphics classes 64-bit compatible"

2014-01-27 14:22:45 +00:00

include

Fix ResTable_config::CONFIG_* typo (MCC vs MNC)

2013-12-16 12:42:36 +01:00

keystore

Remove unused imports from frameworks/base.

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

libs

Clear root level reorder lists to prevent accessing stale DisplayLists

2014-01-24 15:01:40 -08:00

location

Remove unused imports from frameworks/base.

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

media

Revert "AArch64: Make graphics classes 64-bit compatible"

2014-01-27 14:22:45 +00:00

native

Track Looper decoupling from ALooper

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

nfc-extras

…

obex

…

opengl/java

Merge "Fix incorrect name in eglSwapBuffers log wrapper"

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

packages

am dafb2420: am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."

2014-01-26 16:58:24 +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

Revert "AArch64: Make graphics classes 64-bit compatible"

2014-01-27 14:22:45 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

Revert "AArch64: Make graphics classes 64-bit compatible"

2014-01-27 14:22:45 +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

Manual merge of changes from frameworks/base/tools

2014-01-27 10:31:09 -08: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%