tree a204ff363198456eadb8715188f96da1d6c97239
parent 036951f89539ce5d671f0780d8dc4a21d5d8ab74
parent dc2c13623aa0a7e2646d35f89ed2ae0f7f97e831
author Jean-Baptiste Queru <jbq@google.com> 1333390109 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333390109 -0700

am dc2c1362: am 1bfa5508: Use the common implementation of the factory-image-generator

* commit 'dc2c13623aa0a7e2646d35f89ed2ae0f7f97e831':
  Use the common implementation of the factory-image-generator