tree bf93f7d7771813a2fbb494be55242b3e0daceb6a
parent 3f3ea168f281ff03416afde07cb465642be56491
parent a8e4d0e91c6b3c6158153ea1490e969e7def24e5
author George Mount <mount@google.com> 1342795937 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1342795938 -0700

Merge "Give a size for image so test doesn't have to wait for the load." into jb-dev