Mike Lockwood b77f2b51d7 Merge branch 'readonly-p4-master'

2009-04-02 22:34:31 -07:00

api

Merge branch 'readonly-p4-master'

2009-04-02 12:18:20 -07:00

awt

auto import from //depot/cupcake/@135843

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

build

auto import from //depot/cupcake/@135843

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

camera/libcameraservice

AI 143327: am: CL 143177 am: CL 142889 Fix issue #1736153 Camera shutter sound can be muted by new AlarmClock setting.

2009-03-27 18:18:46 -07:00

cmds

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

core

Merge branch 'readonly-p4-master'

2009-04-02 22:34:31 -07:00

data

Automated import from //branches/master/...@142732,142732

2009-03-25 15:43:14 -07:00

docs

AI 143716: am: CL 143696 am: CL 143576 SDK doc change: Fix links from SDK upgrading docs to migration and diff info.

2009-03-31 14:24:19 -07:00

graphics/java

auto import from //branches/cupcake/...@137873

2009-03-11 12:11:56 -07:00

im/java/android/im

auto import from //depot/cupcake/@135843

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

include

Merge branch 'master' of git://android.git.kernel.org/platform/frameworks/base

2009-03-31 22:19:39 -07:00

libs

Merge branch 'readonly-p4-master'

2009-04-02 10:31:50 -07:00

location

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

2009-04-02 11:00:54 -07:00

media

Merge branch 'readonly-p4-master'

2009-04-02 09:33:55 -07:00

opengl

Automated import from //branches/master/...@142688,142688

2009-03-25 15:38:48 -07:00

packages

Merge branch 'readonly-p4-master'

2009-04-02 12:18:20 -07:00

sax/java/android/sax

auto import from //depot/cupcake/@135843

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

services

Merge branch 'readonly-p4-master'

2009-04-02 12:18:20 -07:00

telephony

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

2009-04-02 11:00:54 -07:00

test-runner

AI 144107: am: CL 144098 am: CL 144093 Fix NPE in ActivityUnitTestCase.

2009-04-02 09:56:38 -07:00

tests

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

2009-04-02 11:00:54 -07:00

tools

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07:00

wifi/java/android/net/wifi

AI 143395: am: CL 143266 am: CL 143124 Fix bug #1731826, in which auto-connect to remembered networks does not

2009-03-27 19:54:50 -07:00

Android.mk

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

2009-04-02 11:00:54 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

auto import from //depot/cupcake/@135843

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

preloaded-classes

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

2009-04-02 11:00:54 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%