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

am 1acc67f0: am 96469daa: Merge "Give a size for image so test doesn\'t have... 

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

* commit '1acc67f0':
  Give a size for image so test doesn't have to wait for the load.
parents e3b6652a 1acc67f0
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