Jeff Brown b75fa30aaf resolved conflicts for merge of aca672ba to master ...

Change-Id: I7ae11fca0acdbf513a4870226d0d3e3cafbe9a08

2010-07-15 23:47:29 -07:00

api

resolved conflicts for merge of aca672ba to master

2010-07-15 23:47:29 -07:00

awt

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

build

auto import from //depot/cupcake/@135843

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

cmds

am c74034b6: am 24651682: added BinderService<> template to help creating native binder services

2010-07-14 20:18:50 -07:00

core

resolved conflicts for merge of aca672ba to master

2010-07-15 23:47:29 -07:00

data

am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras.

2010-06-27 20:54:36 -07:00

docs

am 7ccdfbee: am 4cb8293b: am d59f1dea: Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo

2010-07-15 23:27:40 -07:00

graphics

Merge "Populate java objects with native data from a3d file. Remove legacy constructor from programraster Make a3d object creation synchronous"

2010-07-15 15:19:07 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

resolved conflicts for merge of aca672ba to master

2010-07-15 23:47:29 -07:00

keystore

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

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

libs

resolved conflicts for merge of aca672ba to master

2010-07-15 23:47:29 -07:00

location

andriod.location.Criteria: Simplify new location criteria APIs a bit.

2010-06-23 14:34:03 -04:00

media

am 10f8baa4: am 42ef0c71: Initial check-in for software m4v_h263 encoder

2010-07-15 23:04:48 -07:00

native

resolved conflicts for merge of aca672ba to master

2010-07-15 23:47:29 -07:00

obex

Add ABORT support to Obex lib

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

opengl

am 43429036: am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread

2010-07-13 21:11:48 -07:00

packages

Merge "checkpoint tablet status bar"

2010-07-15 11:09:04 -07:00

policy

Fix bug 2835056 - ActionBar doesn't update title properly when set in onCreate

2010-07-14 14:46:37 -07:00

sax

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

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

services

resolved conflicts for merge of aca672ba to master

2010-07-15 23:47:29 -07:00

telephony

am d7da5164: merge from open-source master

2010-07-14 12:23:12 -07:00

test-runner

Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread

2010-07-13 09:46:38 -07:00

tests

Merge "Add support for BitmapShader."

2010-07-15 14:45:37 -07:00

tools

am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread

2010-07-15 11:54:00 -07:00

vpn

DO NOT MERGE

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

wifi/java/android/net/wifi

Pass network properties to ConnectivityService.

2010-07-13 18:07:41 -07:00

Android.mk

am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread

2010-07-15 11:54:00 -07:00

CleanSpec.mk

The status bar draws its icons now.

2010-06-02 14:48:41 -07: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

frameworks/base updates to track merge from dalvik-dev

2010-06-30 00:54:29 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%