am f3847e87: Merge "DO NOT MERGE" into gingerbread

* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
  DO NOT MERGE
This commit is contained in:
James Dong 2010-11-03 09:25:08 -07:00 committed by Android Git Automerger
commit a2adbcb004

Diff Content Not Available