Gilles Debunne a20e873476 resolved conflicts for merge of d7d47941 to master ...

Change-Id: I4ec47b9461c5ba350adfc257bc1820ee079b751e

2010-10-10 18:45:23 -07:00

api

am b323559b: am a2a1ca42: Merge "DropBoxManager.Entry implements Closeable" into gingerbread

2010-10-10 17:46:10 -07:00

build

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

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

resolved conflicts for merge of d7d47941 to master

2010-10-10 18:45:23 -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

Cleanup error message for null binding address.

2010-10-10 17:58:25 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread

2010-10-10 17:14:53 -07:00

keystore

Use explicit intent for installing credentials.

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

libs

Cleanup error message for null binding address.

2010-10-10 17:58:25 -07:00

location

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

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

media

am e0c8545a: am 0fd4e216: Merge "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR." into gingerbread

2010-10-10 17:45:58 -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

Add ABORT support to Obex lib

2010-03-16 09:59:06 -07:00

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

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

am 98e1f384: am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread

2010-10-10 17:15:06 -07:00

telephony

am 965d5337: am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"

2010-10-10 17:46:37 -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 77880ae4: am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread

2010-10-10 14:21:18 -07:00

vpn

Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.

2010-01-29 13:35:51 -08:00

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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

Adding PacketVideo attribution in NOTICE.

2010-05-06 14:15:47 -07:00

preloaded-classes

New API and implementation of DB and memory-backed FDs

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

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%