tree d7238cd60db3af31f25683e848ece66292785c8e
parent 6988c162a38802b02035f019137473e5881f2f50
parent 152440c67acace16dc1655a821352b0d69a61562
author smain@google.com <smain@google.com> 1403798132 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403798132 +0000

am 152440c6: Merge "new device family image for design, not photos" into klp-modular-dev

* commit '152440c67acace16dc1655a821352b0d69a61562':
  new device family image for design, not photos