Adam Powell 86521295cb am bbf00cfb: (-s ours) am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread ...

Merge commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4'

* commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.

2010-10-01 17:07:43 -07:00

api

resolved conflicts for merge of 6718b365 to master

2010-10-01 13:57:04 -07:00

build

…

cmds

Merge "refactored screenshot code"

2010-10-01 12:15:12 -07:00

core

am 007d5b2c: am fd57416c: Fix build.

2010-10-01 17:07:09 -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

Merge "Clarify the explanation of Android's security design."

2010-09-26 14:17:32 -07:00

drm

There is no @note javadoc tag.

2010-09-16 17:00:42 -04:00

graphics

am f7681f84: Do not merge.

2010-10-01 12:36:05 -07:00

icu4j

…

include

Merge "refactored screenshot code"

2010-10-01 12:15:12 -07:00

keystore

Remove the use of FileInputStream.available()

2010-09-09 16:28:48 -07:00

libs

Merge "Apply bilinear filtering to text."

2010-10-01 16:37:52 -07:00

location

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

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

media

am 57853559: am e619a9da: Merge "Start playing live streams from the start, no the middle..." into gingerbread

2010-10-01 11:40:18 -07:00

native

am c3bc8b7b: am 1bfbf19b: Merge "Fix night/notnight resource folder handling." into gingerbread

2010-09-30 14:57:23 -07:00

obex

…

opengl

Initial checkin of a framerate test app

2010-09-28 14:59:20 -07:00

packages

Merge "3012761 Please fix problems with your strings"

2010-10-01 14:32:59 -07:00

policy

resolved conflicts for merge of 4d28e8c5 to master

2010-10-01 16:44:12 -07:00

sax

…

services

am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread

2010-10-01 17:07:21 -07:00

telephony

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

test-runner

Allow all apps to call ContentResolver.getType().

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

tests

Apply bilinear filtering to text.

2010-10-01 16:36:14 -07:00

tools

am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread

2010-10-01 17:07:21 -07:00

voip

am c38e6ae4: am 274e3b5d: Merge "RTP: Start AudioRecord before AudioTrack to avoid being disabled." into gingerbread

2010-09-30 19:47:49 -07:00

vpn

…

wifi/java/android/net/wifi

Wifi: Update code for new BT Apis.

2010-09-28 20:02:33 -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

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%