tree 7a0408415ec6f238c38a05722fb99b107758ed5e
parent c4d61fc0f5b1cd354ade06eb2d13a1949e641a9d
parent 1a1c76e69ab43b8519e94cc6dc0c1165c03873d9
author Gilles Debunne <debunne@google.com> 1286763094 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286763094 -0700

am 1a1c76e6: New hotseat assets.

Merge commit '1a1c76e69ab43b8519e94cc6dc0c1165c03873d9'

* commit '1a1c76e69ab43b8519e94cc6dc0c1165c03873d9':
  New hotseat assets.