tree 363103fcf07b2b4e6c944b02984d3f345b2949f1
parent c2c7a33a25169cdf19a0dcf45ddb3747055c7296
parent a8eef82f394f31272610d7ed80328ee465fa1a0f
author Nicolas Geoffray <ngeoffray@google.com> 1421658653 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1421658654 +0000

Merge "Do not use STMP, it conflicts with the calling convention."