Commit 246d8b7d authored Oct 18, 2010 by Shimeng (Simon) Wang Committed by Android Git Automerger Oct 18, 2010

am 53820a96: (-s ours) am 7ef6834e: Merge "DO NOT MERGE" into gingerbread

Merge commit '53820a96'

* commit '53820a96':
  DO NOT MERGE

There are no changes