tree 2e115c36a823f0e7233bf60b4ad143175ef7b358
parent 076dcaf11b4fd3deef52bddfc2b2e7727f6364a1
parent 2f4fb5eef5ac5c08f7d30c75b56990ce5a729509
author Daniel Sandler <dsandler@android.com> 1384373665 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384373665 -0800

am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev

* commit '2f4fb5eef5ac5c08f7d30c75b56990ce5a729509':
  Bespoke, handcrafted, artisanal assist affordance assets.