| commit | 106fd431ba2794f477e005dfd27e329c8ac6268d | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Tue Jul 14 22:53:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 22:53:31 2015 +0000 |
| tree | 0a0bdf1aa602f7780622aa8383e54c05b185a8d1 | |
| parent | c920aaa7989dac6c2c03ba9b5e5f987e9c7192c6 [diff] | |
| parent | 4abb81b894d97e9924aa47bcc101d8721cfb59d0 [diff] |
am 4abb81b8: am 01c2b053: Merge "Fix mac build" * commit '4abb81b894d97e9924aa47bcc101d8721cfb59d0': Fix mac build