| commit | f24b7203647965c77578c2e1f43b37ca5a990e60 | [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 | daf3eb847871921e76fb6d01150913643ab35b25 [diff] | |
| parent | 7b30946fa51225c62b17aee61cc227499ab6dafe [diff] |
am 3f68bc25: Merge "Probably fix the Mac build." * commit '3f68bc258612148350b465bd847f2a2a2d80943b': Probably fix the Mac build.