Joe Onorato 935865923f resolved conflicts for merge of 07990cf2 to master ...

Change-Id: I62cc2d14820e4cbe80ea433caf323be2df1fb9a8

2010-09-07 14:53:46 -04:00

api

Fix the build for real.

2010-09-03 17:32:16 -07:00

build

…

cmds

Merge "Doc Change:ActivityManager usage doc:running test package"

2010-09-03 15:30:24 -07:00

core

am c19c9e4e: am b1104b37: Merge "Make SharedPreferencesBackupHelper wait for async SharedPreference writes" into gingerbread

2010-09-07 11:18:39 -07:00

data

am fd3f44b3: am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread

2010-09-03 15:14:57 -07:00

docs

am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error

2010-09-03 13:28:18 -07:00

graphics

Merge "Test for decoding Bitmap from MemoryFile ParcelFileDescriptor"

2010-09-03 02:27:05 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

Merge changes I71f5b0fc,I92c7accb

2010-09-03 17:14:51 -07:00

keystore

Don't rely on the system locale for converting to/from bytes.

2010-03-10 11:25:53 -08:00

libs

Merge "Fixing fragment shader bounding code"

2010-09-03 12:58:28 -07:00

location

am d71021cb: am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread

2010-08-27 18:10:38 -07:00

media

Merge changes I71f5b0fc,I92c7accb

2010-09-03 17:14:51 -07:00

native

am df02df11: am 307ed31c: Merge "Remove incomplete input device enumeration NDK API." into gingerbread

2010-08-31 15:53:17 -07:00

obex

Add ABORT support to Obex lib

2010-03-16 09:59:06 -07:00

opengl

Add KHR_gl_texture_2D_image extension string.

2010-08-27 16:08:03 -07:00

packages

resolved conflicts for merge of 07990cf2 to master

2010-09-07 14:53:46 -04:00

policy

Fix 2579224: Add a separate timeout for lockscreen vs display

2010-09-01 21:00:30 -07:00

sax

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

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

services

am b6432ca4: am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread

2010-09-06 20:19:52 -07:00

telephony

am b65fd472: am b6264a87: Fix the build.

2010-09-05 22:03:42 -07:00

test-runner

am ec438e14: am 361199b5: Add PackageManager API to get information about a provider component.

2010-08-31 19:06:25 -07:00

tests

Merge "Fixed the bug in forwarder that prevented ConnectionHandler threads from exiting."

2010-09-06 04:25:15 -07:00

tools

am 31103928: am 192b56d4: Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread

2010-09-02 17:59:51 -07:00

voip

am ea16e72b: am b355714a: Merge "SipManager: always return true for SIP API and VOIP support query." into gingerbread

2010-09-02 19:30:16 -07: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

Merge "Add set/get band in WifiNative"

2010-09-02 15:39:16 -07:00

Android.mk

Update RecentApplications to use shared Carousel widget.

2010-09-03 17:44:57 -07:00

CleanSpec.mk

Missing clean step.

2010-09-01 13:33:16 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

Adding PacketVideo attribution in NOTICE.

2010-05-06 14:15:47 -07:00

preloaded-classes

New API and implementation of DB and memory-backed FDs

2010-08-18 15:39:52 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%