Jean-Baptiste Queru 3100207be5 am 1358b6a4: Tweak to make merges easier ...

* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier

2011-01-29 14:43:33 -08:00

api

am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread

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

build

…

cmds

merge 83fdc69e from gingerbread - do not merge

2011-01-14 18:33:51 -08:00

core

am 1358b6a4: Tweak to make merges easier

2011-01-29 14:43:33 -08:00

data

Move keymaps from sdk/emulator/keymaps.

2011-01-25 19:08:04 -08:00

docs

am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread

2011-01-28 12:00:51 -08:00

drm

Merge "Initial OMA DRM forward lock contribution"

2011-01-13 10:51:13 -08:00

graphics

am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"

2011-01-14 16:11:40 -08:00

include

am 2ba92c71: do not merge bug 3370834 Cherrypick from master

2011-01-26 14:05:18 -08:00

keystore

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00

libs

am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread

2011-01-25 14:46:40 -08:00

location

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00

media

am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.

2011-01-28 10:42:10 -08:00

native

Flush Binder commands in ndk looper.

2011-01-10 14:37:46 -08:00

obex

Bluetooth OBEX timeout problem.

2010-10-27 08:38:30 +02:00

opengl

am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread

2010-12-08 16:20:23 -08:00

packages

Import revised translations. DO NOT MERGE

2011-01-28 13:16:00 -08:00

policy

Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread

2011-01-27 18:22:14 -08:00

sax

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

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

services

am 0ef57993: Merge "Fix issue 2988031." into gingerbread

2011-01-27 18:40:42 -08:00

telephony

am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread

2011-01-29 06:55:38 -08:00

test-runner

am 524133cc: Remove API that snuck into MockPackageManager

2011-01-17 13:05:24 -08:00

tests

Delete browerplugin tests - do not merge

2011-01-29 07:41:39 -08:00

tools

am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"

2011-01-23 12:57:33 -08:00

voip

do not merge bug 3370834 Cherrypick from master

2011-01-26 11:20:01 -08: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

am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread

2010-12-04 23:45:18 -08:00

Android.mk

enable preview mode for docs and add api level 10 flag for api level diffs

2011-01-26 18:29:50 -08:00

CleanSpec.mk

Rough first pass at the NFC technology API.

2010-11-19 20:26:29 -06:00

MODULE_LICENSE_APACHE2

…

NOTICE

Fix omission in NOTICE file.

2011-01-18 15:25:32 -08:00

preloaded-classes

This class no longer exists.

2010-11-04 16:17:52 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%