Irfan Sheriff 869fa653e0 resolved conflicts for merge of 52556689 to gingerbread-plus-aosp ...

Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a

2010-12-01 10:40:05 -08:00

api

am d9334934: Merge "Update of DRM Framework."

2010-11-22 21:25:56 -08:00

build

auto import from //depot/cupcake/@135843

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

cmds

Merge 42c94791 from open-source master

2010-11-04 07:22:44 -07:00

core

am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread

2010-12-01 08:50:00 -08:00

data

am 80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread

2010-11-18 15:06:51 -08:00

docs

am d06010c3: Merge "Doc change: updating ndk download and overview page" into gingerbread

2010-11-30 13:53:41 -08:00

drm

Update of DRM Framework.

2010-11-19 22:02:51 +09:00

graphics

am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread

2010-10-04 12:23:58 -07:00

include

am d9334934: Merge "Update of DRM Framework."

2010-11-22 21:25:56 -08:00

keystore

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00

libs

am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"

2010-11-23 11:14:57 -08:00

location

Remove old location classes.

2010-09-28 17:50:50 -07:00

media

am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread

2010-11-30 14:32:09 -08:00

native

add format parameter to setBufferGeometry

2010-10-25 15:58:35 -07:00

obex

Bluetooth OBEX timeout problem.

2010-10-27 08:38:30 +02:00

opengl

am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread

2010-11-10 14:15:57 -08:00

packages

Merge "Squash ANRs in UsbStorageActivity." into gingerbread

2010-11-03 17:08:03 -07:00

policy

Revert "allow all 4 orientations"

2010-11-13 22:02:13 -08:00

sax

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

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

services

am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread

2010-12-01 09:53:17 -08:00

telephony

am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread

2010-11-30 22:55:37 -08:00

test-runner

am e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."

2010-11-19 15:43:28 -08:00

tests

am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread

2010-10-21 20:17:56 -07:00

tools

am 5580e44c: Merge "Support changing style parent in overlays"

2010-11-05 14:05:41 -07:00

voip

Fix race between ending and answering a SIP call.

2010-12-01 15:02:36 +08: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

resolved conflicts for merge of 52556689 to gingerbread-plus-aosp

2010-12-01 10:40:05 -08:00

Android.mk

Doc change: add AccelerometerPlay to the generated samples.

2010-11-29 18:12:36 -08:00

CleanSpec.mk

Cleanspec to fix incremental build failures of the form:

2010-10-18 15:13:00 -07: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

This class no longer exists.

2010-11-04 16:17:52 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%