Merge "merge two restore scale to one."

This commit is contained in:
Grace Kloba 2010-06-01 10:19:59 -07:00 committed by Android (Google) Code Review
commit 082f920102

Diff Content Not Available