tree e729af738a12a7a30c3a2f09fa715a45c08c0243
parent 29240fe2e55279e9d0b18b97c63c31024cf6b7c7
parent 8d4f3200ee0136ddfe1768e24dd1a3708e6be912
author Scott Main <smain@google.com> 1280875963 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280875963 -0700

am fa32a45a: am f2d16bc5: am 5aa4680e: update device dashboard

Merge commit 'fa32a45af724f675215bff920dd264be4a9aae24'

* commit 'fa32a45af724f675215bff920dd264be4a9aae24':
  update device dashboard