| commit | 52f6d805794c66c9d772ebc5120de36f6aa067d2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:55:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:55:35 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | ec518020b0f25174c516581e1ff3d4759048562c [diff] | |
| parent | a0f331d7a847d0b0c5ed615423a33b5507a722d8 [diff] |
am e3bbb2ab: (-s ours) am 6c04e9a9: am 42640e52: Merge "Add missing #include <memory> for std::unique_ptr on Windows." * commit 'e3bbb2ab00a117bf749d0c7e3072118276c89564':