Craig Mautner 139d2e185a Merge changes Ibbac3f6e,I33c6b4e1 ...

* changes:
  resolved conflicts for merge of b7bba718 to master
  DO NOT MERGE: Eliminate StackBox.

2013-12-19 18:57:27 +00:00

api

Merge "PhoneNumberUtils API changes"

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

cmds

resolved conflicts for merge of b7bba718 to master

2013-12-19 10:55:17 -08:00

core

resolved conflicts for merge of b7bba718 to master

2013-12-19 10:55:17 -08:00

data

KeypressInvalid_48k.ogg was 44.1 kHz previously

2013-11-19 16:40:06 -08:00

docs

am 3bcdbd6b: am 6fda5415: am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution techni

2013-12-18 18:29:37 +00:00

drm

Remove unused imports from frameworks/base.

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

graphics

DO NOT MERGE - Fix improper declaration/use of pointer.

2013-12-18 16:24:21 -08: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

Track Looper decoupling from ALooper

2013-12-19 00:25:07 -08:00

location

Remove unused imports from frameworks/base.

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

media

am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

2013-12-19 13:14:17 +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

Merge "Import translations. DO NOT MERGE"

2013-12-17 17:23:42 +00:00

policy

DO NOT MERGE: Remove obsolete "headless" support

2013-12-09 15:14:37 -08:00

rs

Fix improper declaration/use of pointer.

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

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

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

services

resolved conflicts for merge of b7bba718 to master

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

RenderThread work

2013-12-09 15:57: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 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Use java.util.Objects instead on internal API

2013-12-13 13:40:30 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%