| commit | 4abb81b894d97e9924aa47bcc101d8721cfb59d0 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Tue Jul 14 17:20:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 17:20:45 2015 +0000 |
| tree | bc6225b429352e38c5621f0aaa77899692961c2c | |
| parent | 01cbb586987e975f1dcc742cd501d06e86dcc7a7 [diff] | |
| parent | 01c2b053aa74d9bd461a29e0c252f7a8ce3f115a [diff] |
am 01c2b053: Merge "Fix mac build" * commit '01c2b053aa74d9bd461a29e0c252f7a8ce3f115a': Fix mac build