| commit | 5d996053586550461d175582e47dfd5c52e0c403 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri May 08 19:52:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 19:52:53 2015 +0000 |
| tree | 07d336260bc1646542c3315140d2f3aaaebb0af8 | |
| parent | cd8c003fe7cd8694bccc7d43bb8a5626f9597a12 [diff] | |
| parent | 3f68bc258612148350b465bd847f2a2a2d80943b [diff] |
am 3f68bc25: Merge "Probably fix the Mac build." * commit '3f68bc258612148350b465bd847f2a2a2d80943b': Probably fix the Mac build.