tree ee617577bd2bcabf8aaee3ec9262535843ce0fc1
parent 1fff0b321c226afb056907d4accda4aec498dd2a
parent 16e5d71b6bf78d00680d7e9efaf4e94273941292
author Scott Main <smain@google.com> 1403801682 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403801682 +0000

am 16e5d71b: Merge "Revert "new device family image for design, not photos"" into klp-modular-dev

* commit '16e5d71b6bf78d00680d7e9efaf4e94273941292':
  Revert "new device family image for design, not photos"