tree 27f8d41fc7b7ef4bb01c1d7cdafbf3c5bf749307
parent a6b8089a621bc96eef1666ebc496a5aefe968f64
author Emily Shack <emshack@google.com> 1449005806 -0800
committer Emily Shack <emshack@google.com> 1449005806 -0800

Syncing settings data correctly.
Removing outdated images from assets and texture.go

Change-Id: I308fb5b4a285eb0a8d1d18a7a5abf30a10fcad9b