| commit | c43a3c59c45cef7711d073f022cae6400a0043a9 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Tue Sep 15 23:47:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 23:47:24 2015 +0000 |
| tree | 522a8af6a09f6b4e443b5ca2d226fe738e4ab424 | |
| parent | e82b95bbc0351fcad0a03d54b4467c6844114a23 [diff] | |
| parent | 35a68e69ce08e2d6c2c4696330b0cf918e167559 [diff] |
am 35a68e69: Merge "Fix mac build." * commit '35a68e69ce08e2d6c2c4696330b0cf918e167559': Fix mac build.