resolved conflicts for merge of e0b5f33c to master

Browse Source

...

This commit is contained in:

Suchi Amalapurapu

2009-07-21 17:16:35 -07:00

parent 5195f7825a e0b5f33c68

commit 8a45c87d41

1 changed files with 572 additions and 316 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

888

src/com/android/settings/ManageApplications.java

File diff suppressed because it is too large Load Diff