tree ea90055fb33a618a07cdfd1be9d0f5bfcad9f054
parent 32a684f8c53f30620421c886d0f801bd0c84a5f3
parent 514fb121c5889516d396f7f9b425499788a8f644
author mindyp <mindyp@google.com> 1357853644 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357853644 -0800

am 514fb121: Merge "Make sure we resize even single images" into jb-ub-mail-ur8

* commit '514fb121c5889516d396f7f9b425499788a8f644':
  Make sure we resize even single images