tree 2aa6dd149d7abf43b86f12e902841d561ed9be12
parent 6b4b25d093b0a3008d6e275438c79db9c21daab9
parent 070a990c7f4a05f4e34c4a6719d0fbe62e887eb7
author Justin Ho <justinho@google.com> 1287679875 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287679875 -0700

am 070a990c: (-s ours) am eceda0e7: DO NOT MERGE - Updated hotseat icons (mdpi and hdpi)

Merge commit '070a990c7f4a05f4e34c4a6719d0fbe62e887eb7'

* commit '070a990c7f4a05f4e34c4a6719d0fbe62e887eb7':
  DO NOT MERGE - Updated hotseat icons (mdpi and hdpi)