tree 7189d0dfda49a910c5586c104945119386179988
parent 94d3522c8193b4dcb4e88f697d0f68996da7e395
parent 424a6240b43d283109f07f8094cd8ab1f810c9dd
author Jean-Baptiste Queru <jbq@google.com> 1333389994 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333389994 -0700

am 424a6240: am 36cbd9ab: Common part of the factory-image-generator

* commit '424a6240b43d283109f07f8094cd8ab1f810c9dd':
  Common part of the factory-image-generator