repo sync 3905bc6ca3 am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp ...

* commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.

2011-02-24 10:26:49 -08:00

api

@hide DPM global proxy settings

2011-02-16 10:53:33 -08:00

build

Fix the naming of the heap growth limit property.

2011-02-01 20:21:48 -08:00

cmds

fix [3374821] Cannot take screenshot of HC preview

2011-02-08 20:43:00 -08:00

core

am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb

2011-02-23 18:02:45 -08:00

data

Merge "Fix bug 3425610 Reduce lock / unlock sound level" into honeycomb

2011-02-04 16:06:45 -08:00

docs

am c516c771: docs: fix md5 sums

2011-02-23 14:17:30 -08:00

drm

am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb

2011-01-19 15:59:13 -08:00

graphics

clean up and add javadocs

2011-02-09 16:24:12 -08:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am 93552de8: Merge "stubs"

2011-02-11 09:54:59 -08:00

keystore

Update the path of the intent to unlock keystore.

2011-01-20 20:23:59 +08:00

libs

am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb

2011-02-17 20:21:35 -08:00

location

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00

media

am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb

2011-02-22 21:15:19 -08:00

native

Add API to get path to OBBs.

2011-01-16 18:43:04 -08:00

obex

Bluetooth OBEX timeout problem.

2010-10-27 16:13:59 -07:00

opengl

Fix a multithreading bug in libagl's EGL.

2011-01-30 15:59:36 -08:00

packages

am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb

2011-02-23 15:36:08 -08:00

policy

am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb

2011-01-28 16:26:05 -08:00

sax

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

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

services

am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb

2011-02-23 18:02:45 -08:00

telephony

am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

2011-02-15 12:40:49 -08:00

test-runner

docs: fix links to revised fundamentals documents

2011-02-08 11:37:44 -08:00

tests

Empty the clip rect when intersection is empty.

2011-02-04 00:59:34 -08:00

tools

am 02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.

2011-02-14 09:57:17 -08:00

voip

Merge "Merge "SipService: registers broadcast receivers on demand."" into honeycomb

2011-01-18 02:25:52 -08:00

vpn

Make VpnService synchronous API.

2011-01-20 12:51:43 +08:00

wifi/java/android/net/wifi

DO NOT MERGE Add support for background scanning

2011-02-23 10:49:36 -08:00

Android.mk

Doc change: fixing renderscript samples

2011-02-17 18:44:31 -08:00

CleanSpec.mk

Hook up large heap API.

2011-01-19 16:13:18 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp

2011-01-17 14:17:12 -08:00

preloaded-classes

Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

2011-01-24 18:17:21 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%