Craig Mautner b859449b71 resolved conflicts for merge of 88bfc6dd to master ...

Change-Id: Ib656ac0591b21ad14f2df51021729552e9373515

2014-01-08 09:51:33 -08:00

api

am 43bc1c07: am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"

2014-01-08 16:10:42 +00:00

cmds

resolved conflicts for merge of 88bfc6dd to master

2014-01-08 09:51:33 -08:00

core

resolved conflicts for merge of 88bfc6dd to master

2014-01-08 09:51:33 -08:00

data

Add Rhodi kl file

2013-12-18 18:20:43 -08:00

docs

am 9795592c: am 976b0d13: am fd08cd48: am 0d4068ad: am ff65ca29: Merge "docs: Updated instructions for setting up In-app Billing test accounts to reflect new dev console UI. Bug: 7044477" into klp-docs

2014-01-07 00:44:57 +00:00

drm

Remove unused imports from frameworks/base.

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

graphics

Merge "Add support for specifying Drawable color filter in XML"

2014-01-07 23:53:47 +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

EGL migration to native

2014-01-07 14:53:55 -08:00

location

Remove unused imports from frameworks/base.

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

media

am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"

2014-01-07 13:10:19 +00:00

native

Track Looper decoupling from ALooper

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

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

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

Merge "PrintSpooler crash if printer is reported to have only one color mode."

2014-01-07 02:03:01 +00:00

policy

Show hideycling for non-primary users.

2013-12-09 11:59:45 -05:00

rs

Fix improper declaration/use of pointer.

2013-12-18 16:33:49 -08:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

Remove unused imports from frameworks/base.

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

services

resolved conflicts for merge of 88bfc6dd to master

2014-01-08 09:51:33 -08:00

telephony/java

Merge "PhoneNumberUtils API changes"

2013-12-19 18:51:49 +00:00

test-runner

Remove unused imports from frameworks/base.

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

tests

Don't attempt to launch disabled activities in smoke test.

2014-01-02 14:41:21 -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

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

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%