Jean-Baptiste Queru 9f115228c8 am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp ...

Merge commit '09f672509b78344258f1b0d9f021d2ec99942515'

* commit '09f672509b78344258f1b0d9f021d2ec99942515':
  Fix compilation errors in libmedia, libstagefright.

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

api

Maybe fix #2925641: calling onCreateOptionsMenu before attached activity

2010-08-17 18:53:19 -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 18dd95f4: am 05b20c03: Merge "bootanimation: Don\'t open non-existing bootanimation.zip"

2010-08-17 07:51:40 -07:00

core

Maybe fix #2925641: calling onCreateOptionsMenu before attached activity

2010-08-17 18:53:19 -07:00

data

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

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

docs

am 1ef758b8: am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo

2010-08-12 14:36:35 -07:00

graphics

Merge "Make java entry points for native fifo synchronized."

2010-08-17 19:29:17 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am ddbcce3a: Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp

2010-08-17 09:06:52 -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 "Make java entry points for native fifo synchronized."

2010-08-17 19:29:17 -07:00

location

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00

media

am f54da15b: am eff30e3d: Change the default time scale for audio/video track during recording and reduce rounding errors in calculating the sample duration

2010-08-16 15:19:29 -07:00

native

am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread

2010-08-11 00:50:56 -07:00

obex

Add ABORT support to Obex lib

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

opengl

am a4ed1c67: am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread

2010-08-16 07:49:24 -07:00

packages

Import revised translations.

2010-08-17 16:50:06 -07:00

policy

Maybe fix #2925641: calling onCreateOptionsMenu before attached activity

2010-08-17 18:53:19 -07:00

sax

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

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

services

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

2010-08-17 14:25:06 -07:00

telephony

resolved conflicts for merge of 31202b1a to master

2010-08-16 14:42:01 -07:00

test-runner

Add new ContentProvider for doing conversions to data streams.

2010-08-08 18:49:31 -07:00

tests

Fix save()/restore() issues in the OpenGL renderer.

2010-08-17 18:40:21 -07:00

tools

am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread

2010-08-16 15:16:52 -07:00

voip

Fix the IN_CALL mode issue.

2010-08-16 18:02:31 +08:00

vpn

DO NOT MERGE

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

wifi/java/android/net/wifi

Add documentation to NetworkStateTracker and a small change to the API.

2010-08-13 16:11:42 -07:00

Android.mk

am 96e24634: am e6bfceeb: am 3b70e159: Merge "Adding a sample accessibility service -make" into froyo

2010-08-17 10:59:06 -07:00

CleanSpec.mk

Make libhwui entirely optional.

2010-08-08 17:45:07 -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

resolved conflicts for merge of 1b7e4d5a to master

2010-08-05 14:02:36 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%