Marco Nelissen 3caeffac54 am 779a6e41: (-s ours) am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled. ...

Merge commit '779a6e41d7e5cdb27b802551249257d600dc2d27'

* commit '779a6e41d7e5cdb27b802551249257d600dc2d27':
  Do not merge.

2010-10-10 14:20:06 -07:00

api

am ea445758: am 08faac3c: Unhide SIP API.

2010-10-10 14:19:29 -07:00

build

…

cmds

am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread

2010-10-10 14:19:52 -07:00

core

am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread

2010-10-10 14:19:52 -07:00

data

am c6581a10: am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details

2010-09-27 11:45:51 -07:00

docs

Resolved conflicts for merge of 2bd6afed to master

2010-10-08 13:09:31 -07:00

drm

Update of DRM framework.

2010-10-04 22:14:53 +09:00

graphics

Merge "changing vec4 to vec2 for perf reasons."

2010-10-06 16:09:36 -07:00

icu4j

…

include

Merge "Move binder magic from the Surface class to GraphicBuffer."

2010-10-10 13:36:13 -07:00

keystore

Use explicit intent for installing credentials.

2010-10-08 08:21:17 +08:00

libs

Merge "Move binder magic from the Surface class to GraphicBuffer."

2010-10-10 13:36:13 -07:00

location

am cb51c0c7: am 3e94b94f: Merge "Remove old location classes." into gingerbread

2010-09-28 18:24:48 -07:00

media

am bb708373: am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread

2010-10-10 11:25:54 -07:00

native

am 22cb4ef8: am d577cfd7: Merge "Switch Looper back to using poll() instead of epoll()." into gingerbread

2010-10-10 12:52:40 -07:00

obex

…

opengl

libagl: eglSwapInterval fix

2010-10-06 16:44:37 -07:00

packages

am cef38339: am 6d44456d: Merge "Make USB mass storage hide keyguard when shown." into gingerbread

2010-10-08 17:45:08 -07:00

policy

Merge "Get rid of the global actions menu on tablets."

2010-10-08 13:29:37 -07:00

sax

…

services

am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread

2010-10-10 14:19:52 -07:00

telephony

resolved conflicts for merge of 5df4b5a7 to master

2010-10-10 11:09:45 -07:00

test-runner

Allow all apps to call ContentResolver.getType().

2010-09-27 18:05:44 -07:00

tests

Revert "Merge "Allow notifications to not specify a contentIntent.""

2010-10-08 16:22:53 -07:00

tools

am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread

2010-10-08 17:59:13 -07:00

voip

am ea445758: am 08faac3c: Unhide SIP API.

2010-10-10 14:19:29 -07:00

vpn

…

wifi/java/android/net/wifi

Use LinkProperties for IP and proxy configuration

2010-10-08 12:41:11 -07:00

Android.mk

resolved conflicts for merge of f4c3b7e9 to master

2010-09-29 12:20:51 -07:00

CleanSpec.mk

update clean spec

2010-09-08 15:24:49 -04:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

New API and implementation of DB and memory-backed FDs

2010-08-18 15:39:52 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%