resolved conflicts for merge of 1cf55c56 to master

Browse Source

...

This commit is contained in:

Paul Westbrook

2009-12-10 08:51:27 -08:00

parent 9b902a5266 1cf55c566c

commit b223e93bd2

1 changed files with 0 additions and 2468 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2468

core/java/android/provider/Gmail.java

File diff suppressed because it is too large Load Diff