Nick Pelly 978e41fccf am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread ...

* commit '8d98aebe286be0ca963232afce3d5ceec67d3d7a':
  Fix technology extra naming for IsoDep and NfcB (API part).

2011-01-04 18:33:41 -08:00

api

am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread

2010-12-22 12:40:57 -08:00

build

auto import from //depot/cupcake/@135843

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

cmds

am e4a59519: Fix issue #3154576: battery stats checkin should include UID -> packages+ map

2010-12-13 14:37:09 -08:00

core

am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread

2011-01-04 18:33:41 -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 00410256: cherrypick Change-Id: I51b73bb0bb09ef0b928efec151f55e0bf8ffc954 docs: fix typos

2010-12-20 11:30:35 -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 a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread

2010-12-07 14:22: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 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

am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread

2010-12-22 12:40:57 -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 revised translations. DO NOT MERGE

2010-12-09 16:54:24 -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 949fc0ef: Merge "frameworks/base: Fix to release references to previous live wallpaper"

2010-12-28 10:38:38 -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

RTP: Send silence packets on idle streams for every second.

2011-01-04 19:54:49 +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

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%