am e3bbb2ab: (-s ours) am 6c04e9a9: am 42640e52: Merge "Add missing #include <memory> for std::unique_ptr on Windows."

* commit 'e3bbb2ab00a117bf749d0c7e3072118276c89564':
This commit is contained in:
Elliott Hughes 2015-08-27 11:55:35 +00:00 committed by Android Git Automerger
commit 8545944dcf

Diff content is not available