| commit | 7b64c7c585f3310c3a56cd09a31f9c06f4d5fdd9 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Mon Jan 19 10:15:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 10:15:40 2015 +0000 |
| tree | 274f0af3f8011ce8399b89980c80597976696cdf | |
| parent | 72fb4c843ed284f213340d5f805b0f7ab2fa52ac [diff] | |
| parent | cbbd3c5d6a005859e250d4c2c69b66f7743b4339 [diff] |
am cbbd3c5d: am 1235c46d: Merge "Do not use STMP, it conflicts with the calling convention." * commit 'cbbd3c5d6a005859e250d4c2c69b66f7743b4339': Do not use STMP, it conflicts with the calling convention.