am 9afeda05: (-s ours) am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread

Browse Source

Merge commit '9afeda0519c4f4892611565d678f01d269863bb8'

* commit '9afeda0519c4f4892611565d678f01d269863bb8':
  Manual merge of change 53051 from master (DO NOT MERGE)

...

This commit is contained in:

Evan Millar 2010-06-21 12:12:55 -07:00 committed by Android Git Automerger

parent 9b0db86c2e c7e9defdd3

commit 1b14497710

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

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

Diff Content Not Available