am 41f79ea1: (-s ours) am 090489b3: Merge "DO NOT MERGE: Fix flaky tests" into gingerbread

Browse Source

Merge commit '41f79ea188fae1519af931a01948da14834f231e'

* commit '41f79ea188fae1519af931a01948da14834f231e':
  DO NOT MERGE: Fix flaky tests

...

This commit is contained in:

Makoto Onuki 2010-09-20 19:33:19 -07:00 committed by Android Git Automerger

parent f7534f93a3 41f79ea188

commit e12520d649

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