tree 76b9026aec1149149c874ee71b70461832837129
parent c24ce525c7b424d54758d48754929296505e23b2
parent c857431f346b27ebfc3228c369e422d8872afbef
author Stuart Scott <stuartscott@google.com> 1411599282 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411599282 +0000

am c857431f: Merge changes If2e86889,I5334d75b into lmp-dev

* commit 'c857431f346b27ebfc3228c369e422d8872afbef':
  Move from uri to name
  Clean up