tree f9def2d3b1a21f2652a9f74c834d6a4e324e31d1
parent 0417f1db7e6b720d649e618439bd6aaef8998618
parent 83285cec5f854c3e0fc91b51a39e1a69a058093f
author Dan Willemsen <dwillemsen@google.com> 1443125116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443125116 +0000

am 83285cec: Merge "Add ProductVariables.DeviceName, set defaults to flounder"

* commit '83285cec5f854c3e0fc91b51a39e1a69a058093f':
  Add ProductVariables.DeviceName, set defaults to flounder