tree 085857558285a6f052ecf8a2120942076913ccff
parent b84c27c0af713270f0de6f154702a46d9250bbe1
parent ef1d7961fcb42b5b9f6ca159917a86c7a63db9ec
author Justin Ho <justinho@google.com> 1287244729 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287244729 -0700

am ef1d7961: (-s ours) am f9617d3b: Updated hotseat icons(mdpi and hdpi) and trashcan (mdpi)

Merge commit 'ef1d7961fcb42b5b9f6ca159917a86c7a63db9ec'

* commit 'ef1d7961fcb42b5b9f6ca159917a86c7a63db9ec':
  Updated hotseat icons(mdpi and hdpi) and trashcan (mdpi)