Hung-ying Tyan aeba1bc0c3 Revert "Revert "resolved conflicts for merge of 8788d140 to master"" ...

This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.

Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a

2010-10-03 01:18:34 +08:00

api

Fix the build

2010-10-01 19:44:17 -07:00

build

…

cmds

am a4f1eb3d: am 9430f9d3: Merge "KeyStore: Update the parameters of generating master keys." into gingerbread

2010-10-01 17:08:30 -07:00

core

Merge "Added looping parameter to AdapterViewAnimator / StackView"

2010-10-01 17:23:08 -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

am de5e6afb: am 91b0bc2a: am 32441bbe: docs: device dashboard update for 10/1

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

drm

There is no @note javadoc tag.

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

graphics

Merge "Support for 64-bit integer type."

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

icu4j

…

include

am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread

2010-10-01 21:49:39 -07:00

keystore

…

libs

am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread

2010-10-01 21:49:39 -07:00

location

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

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

media

am 2bf74b8f: am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbread

2010-10-01 17:35:40 -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

DO NOT MERGE Fix bug 3026771, other design/asset fixes.

2010-10-01 14:35:22 -07:00

policy

resolved conflicts for merge of 4d28e8c5 to master

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

sax

…

services

am e11b76d3: am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread

2010-10-01 21:49:29 -07:00

telephony

Revert "Revert "resolved conflicts for merge of 8788d140 to master""

2010-10-03 01:18:34 +08: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

…

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%