tree 5877552b0190ccccb00f35ffa6498515d5233184
parent 5b7d27c1353b756dcee859c4e954156737c83489
author Emily Shack <emshack@google.com> 1450137336 -0800
committer Emily Shack <emshack@google.com> 1450137336 -0800

Adding mutexes to avoid crashes
Adding shelf for play view take trick

Change-Id: I5c0d1a98a2d11539d756b75d0954b419292b9770