am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

Browse Source

* commit 'fed7a99a5294856d930e18225898828bd6755be1':
  Quick fix for bug 5646217 blocking automation tests

...

This commit is contained in:

Daniel Sandler 2011-11-29 05:51:18 -08:00 committed by Android Git Automerger

parent ef56d02fe9 a6e18fc3de

commit c6f48c6842

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