tree 91eef5cd4534c3391b102dba154b2828191aab16
parent ef7b5da59cc8ad3b9f6545a497edd7bd27a6e63d
parent f30ad5f1bf33baceeca6b770464fb543b58af985
author Winson Chung <winsonc@google.com> 1312838595 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1312838595 -0700

Merge "Making hotseat a fiver."