tree 12a03231acc1e5ae60a9bcfb6fb6e6cf974c4bb9
parent 049ccd4b1833496de515a9e01717243a1b372dc6
parent 08d7d44bc33a7251ff34287422c7751c5a65683d
author Mathieu Chartier <mathieuc@google.com> 1375319800 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375319800 -0700

am 08d7d44b: Fix image generation.

* commit '08d7d44bc33a7251ff34287422c7751c5a65683d':
  Fix image generation.