am fbd26467: Merge "DO NOT MERGE" into gingerbread

Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp

* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
  DO NOT MERGE
This commit is contained in:
Shimeng (Simon) Wang 2010-09-13 11:51:55 -07:00 committed by Android Git Automerger
commit 7be0c0b497

Diff Content Not Available