tree 38c17d093cac88761e027f67f61a48437b328256
parent dd321c169bb1df0f98f0b5bffbbafa938b4ebc83
parent a573d6b18686266667c8efd9d7291ecd28efa67c
author John Reck <jreck@google.com> 1446509655 +0000
committer android-build-merger <android-build-merger@google.com> 1446509655 +0000

Merge "Teach sp<> how to std::move" am: 518d043c86 am: bb12b91ae1
am: a573d6b186

* commit 'a573d6b18686266667c8efd9d7291ecd28efa67c':
  Teach sp<> how to std::move