tree cc60040e10610964e5d69b4b4f4be9e3823a157e
parent 5bb214b6cd25809de2a4d62607ce69cd16587678
parent f01d34445953e6b9c9b13de1dd32a5c0ee5abab5
author Nicolas Geoffray <ngeoffray@google.com> 1427727222 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1427727223 +0000

Merge "Implement a proper solution for temps."