Commit 1acc67f0 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

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

* commit '96469daa':
  Give a size for image so test doesn't have to wait for the load.
parents 1978be8c 96469daa
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment