am 4c7c2f73: (-s ours) am 532c8600: Revert 21f0f97eba

Merge commit '4c7c2f73af773872faf5a65167d74900865d96ba'

* commit '4c7c2f73af773872faf5a65167d74900865d96ba':
  Revert 21f0f97eba
This commit is contained in:
Ying Wang 2010-09-01 17:03:23 -07:00 committed by Android Git Automerger
commit 5200114fe8

Diff Content Not Available