tree 97c3644c5c4bd5bd46b720f8e7da2f01d58fe959
parent 5623b074977d55a61f29099f44670916c6282e51
parent 07ac175452a4ba984a478a29416b8c4da2fce28f
author Shimeng (Simon) Wang <swang@google.com> 1310420404 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310420404 -0700

Merge "Set mActualScale when initialScale is set."