repo sync d439ac396e resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp ...

Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26

2011-01-11 15:26:51 -08:00

api

am ca36d863: Update API current.xml to unbreak build.

2011-01-10 14:19:30 -08:00

build

auto import from //depot/cupcake/@135843

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

cmds

am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores

2011-01-09 13:04:01 -08:00

core

am 25be5365: Implement canMakeReadonly().

2011-01-10 12:14:36 -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 9b447d12: docs: catchup gingerbread to gingerbread-docs with misc changes

2011-01-07 15:32:04 -08:00

drm

DRM Framework bug fixes.

2010-11-30 16:27:42 +09:00

graphics

am 69ea4e15: Documentation fixes found over vacation hacking.

2011-01-05 13:52:53 -08:00

include

am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread

2011-01-10 12:09:09 -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 bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"

2010-12-28 11:39:21 -08:00

location

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00

media

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

2011-01-11 15:26:51 -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 e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread

2010-12-08 16:20:23 -08:00

packages

Import translations for additional languages.

2011-01-06 10:29:06 -08:00

policy

Fix policy issues when screen is off. (DO NOT MERGE)

2010-12-22 16:00:21 -08:00

sax

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

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

services

am 91c459ec: Copy user info from PackageSetting as well

2011-01-11 12:27:42 -08:00

telephony

am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread

2011-01-04 17:47:47 -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 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread

2010-12-14 11:28:50 -08:00

voip

Add auth. username in SipProfile.

2011-01-07 15:21:54 +08:00

vpn

DO NOT MERGE

2010-03-29 18:12:24 -07:00

wifi/java/android/net/wifi

am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread

2010-12-04 23:45:18 -08:00

Android.mk

Merge branch gingerbread-nfc into gingerbread.

2010-12-05 14:45:29 -08:00

CleanSpec.mk

Rough first pass at the NFC technology API.

2010-11-19 20:26:29 -06: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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%