tree a18e0d0b7f69f7da3f53716c650810a8ed49e5f7
parent 43a73e04a456a9d053e8f3ff192e2fe68ca01361
parent 14f98d5acdb00aea40550e80bc20a76e20257c3f
author Jean-Baptiste Queru <jbq@google.com> 1355874759 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355874759 -0800

am 14f98d5a: Merge from AOSP staging branch

* commit '14f98d5acdb00aea40550e80bc20a76e20257c3f':
  Generate fixed JOP40C factory images
  JOP40D factory images for Manta