| commit | b164072341ca6b60d99675a9fa46565d0a11b4af | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri May 08 20:04:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 20:04:34 2015 +0000 |
| tree | 8a47f09bbf4359c3d72b9069b14b3c8484e0b03d | |
| parent | 52a3112a23fe1cf29468717fd6a23595fdefd624 [diff] | |
| parent | 5d996053586550461d175582e47dfd5c52e0c403 [diff] |
am 5d996053: am 3f68bc25: Merge "Probably fix the Mac build." * commit '5d996053586550461d175582e47dfd5c52e0c403': Probably fix the Mac build.