| commit | cbbd3c5d6a005859e250d4c2c69b66f7743b4339 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Mon Jan 19 10:09:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 10:09:44 2015 +0000 |
| tree | 363103fcf07b2b4e6c944b02984d3f345b2949f1 | |
| parent | 7b1bbfd8da3987cc59e27d82feb30953e7f029b4 [diff] | |
| parent | 1235c46dc5d5a329a9074e2168219a3e85ad6d48 [diff] |
am 1235c46d: Merge "Do not use STMP, it conflicts with the calling convention." * commit '1235c46dc5d5a329a9074e2168219a3e85ad6d48': Do not use STMP, it conflicts with the calling convention.