Mathias Agopian 0179ff6594 Merge commit 'goog/master' into master_gl ...

Conflicts:
	libs/utils/Parcel.cpp

2009-04-10 14:36:33 -07:00

api

Merge branch 'readonly-p4-master'

2009-04-09 19:54:37 -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 commit 'goog/master' into master_gl

2009-04-10 14:36:33 -07:00

data

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

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

docs

AI 144405: am: CL 144307 am: CL 144306 Fix SDK issue 1716562 - Broadcast mechanism documentation should be improved.

2009-04-02 23:15:58 -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

Integrate from //sandbox/mathias/donut/...@145728

2009-04-10 14:24:30 -07:00

libs

Merge commit 'goog/master' into master_gl

2009-04-10 14:36:33 -07:00

location

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

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

media

Revert "Changes required to accommodate OpenCORE 2.0"

2009-04-08 14:40:48 -07:00

opengl

Integrate from //sandbox/mathias/donut/...@145728

2009-04-10 14:24:30 -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 144706: am: CL 144705 Teleca patch from 03/27/2009, fixes some CDMA issues.

2009-04-06 15:23:24 -07:00

test-runner

AI 144453: am: CL 144452 More Location Manager cleanup:

2009-04-03 08:24:47 -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 branch 'readonly-p4-master'

2009-04-03 16:46:32 -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 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

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%