Cynthia Wong 5167f9e28b Merge branch 'readonly-p4-master'

2009-04-08 13:33:32 -07:00

..

BaseColumns.java

auto import from //depot/cupcake/@135843

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

Browser.java

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

2009-03-13 13:04:22 -07:00

Calendar.java

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

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

CallLog.java

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

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

Checkin.java

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

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

Contacts.java

AI 143308: am: CL 143159 am: CL 142855 Fix SHOW_OR_CREATE intent to correctly handle duplicate E-mail or IM entries for a person.

2009-03-27 17:57:15 -07:00

Downloads.java

auto import from //depot/cupcake/@135843

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

DrmStore.java

auto import from //depot/cupcake/@135843

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

Gmail.java

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

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

Im.java

auto import from //depot/cupcake/@135843

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

LiveFolders.java

auto import from //depot/cupcake/@135843

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

MediaStore.java

auto import from //depot/cupcake/@135843

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

OpenableColumns.java

auto import from //depot/cupcake/@135843

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

package.html

auto import from //depot/cupcake/@135843

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

SearchRecentSuggestions.java

auto import from //depot/cupcake/@135843

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

Settings.java

AI 145124: am: CL 144928 Make the uphill discarding ops functionality controllable via a Gservices flag

2009-04-08 13:32:09 -07:00

SubscribedFeeds.java

auto import from //depot/cupcake/@135843

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

Sync.java

auto import from //depot/cupcake/@135843

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

SyncConstValue.java

auto import from //depot/cupcake/@135843

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

Telephony.java

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

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

UserDictionary.java

auto import from //depot/cupcake/@135843

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