The Android Open Source Project d3af727927 Merge branch 'readonly-p4-master' ...

Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java

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

..

accounts

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

2009-03-24 22:48:12 -07:00

annotation

auto import from //depot/cupcake/@135843

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

app

AI 144210: am: CL 144182 am: CL 144181 Modify ProgressDialog class and its xml so that it follows the

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

appwidget

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

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

bluetooth

AI 143812: am: CL 143788 am: CL 143740 Don't clear supported profiles in settings app if getRemoteClass returns error.

2009-03-31 14:42:33 -07:00

content

Merge branch 'readonly-p4-master'

2009-04-02 09:17:54 -07:00

database

Merge branch 'open_source' into google_internal

2009-03-29 08:55:27 -07:00

ddm

auto import //branches/master/...@140412

2009-03-18 22:20:26 -07:00

debug

auto import from //depot/cupcake/@135843

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

emoji

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

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

hardware

AI 144139: am: CL 144135 am: CL 144134 Fix issue 1750132 - SensorManager listener 'rate' parameter units are undocumented

2009-04-02 10:15:00 -07:00

inputmethodservice

AI 143296: Merge from donut Change 143147

2009-03-27 17:43:53 -07:00

net

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

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

os

AI 144129: Remove hidden class android.os.Exec.

2009-04-02 10:09:47 -07:00

pim

auto import from //depot/cupcake/@135843

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

preference

AI 143298: am: CL 143150 Fixed the problem where setEnabled(false) has no effect from onResume().

2009-03-27 17:46:36 -07:00

provider

Merge branch 'readonly-p4-master'

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

security

auto import from //depot/cupcake/@135843

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

server

AI 143812: am: CL 143788 am: CL 143740 Don't clear supported profiles in settings app if getRemoteClass returns error.

2009-03-31 14:42:33 -07:00

speech

auto import from //depot/cupcake/@135843

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

syncml

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

2009-03-25 15:23:27 -07:00

test

auto import from //depot/cupcake/@135843

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

text

AI 144003: am: CL 144002 am: CL 144001 Fix tiny bug in Rfc822Token.java

2009-04-02 08:52:56 -07:00

util

AI 144014: am: CL 144013 Rename PoolFactory to Pools, to follow the java.util convention (Collections, Arrays.)

2009-04-02 09:03:39 -07:00

view

Merge branch 'readonly-p4-master'

2009-04-02 09:04:51 -07:00

webkit

Merge branch 'readonly-p4-master'

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

widget

Merge branch 'readonly-p4-master'

2009-04-02 09:20:36 -07:00

package.html

auto import from //depot/cupcake/@135843

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