Dirk Dougherty 18b9eafd39 Merge branch 'readonly-p4-master'

2009-04-18 21:11:00 -07:00

api

Manually merge 129, 174, and 233 from donut

2009-04-17 10:32:56 -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-18 15:29:04 -07:00

data

AI 144741: am: CL 144740 am: CL 144739 More notification sounds

2009-04-06 18:39:53 -07:00

docs

AI 146573: am: CL 146345 am: CL 146341 g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change)

2009-04-18 21:09:48 -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

AI 145994: Integrate #145778 from Donut.

2009-04-13 16:11:55 -07:00

libs

Merge branch 'readonly-p4-master'

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

location

AI 144664: am: CL 144663 Use Binder interfaces between NetworkLocationManager and LocationManagerService.

2009-04-06 10:52:24 -07:00

media

Merge change 79

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

opengl

Manually merge 129, 174, and 233 from donut

2009-04-17 10:32:56 -07:00

packages

Merge branch 'readonly-p4-master'

2009-04-08 00:39:52 -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-08 19:24:05 -07:00

telephony

AI 146533: am: CL 146124 am: CL 146123 Change Belfast to Dublin

2009-04-16 12:40:56 -07:00

test-runner

AI 145994: Integrate #145778 from Donut.

2009-04-13 16:11:55 -07:00

tests

AI 146551: am: CL 146246 am: CL 146225 Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early.

2009-04-18 15:57:27 -07:00

tools

Merge branch 'readonly-p4-master'

2009-04-03 16:46:32 -07:00

wifi/java/android/net/wifi

AI 146222: Manual merge of 145980 from donutburger => master.

2009-04-14 15:40:20 -07:00

Android.mk

AI 144664: am: CL 144663 Use Binder interfaces between NetworkLocationManager and LocationManagerService.

2009-04-06 10:52:24 -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%