tree 60f8eda4a015018b88e473eecdb73d003c0781a3
parent aa5aa316f13759837bfb830041abff2b96d2312b
parent 142f4c5623ade2c55d2a8de7e6a5fedf17bccc96
author Andrew Sapperstein <asapperstein@google.com> 1407363174 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407363174 +0000

am 142f4c56: Merge "Don\'t use "done" for string name." into ub-chips-cranbrook

* commit '142f4c5623ade2c55d2a8de7e6a5fedf17bccc96':
  Don't use "done" for string name.