| commit | 2dd5ec2996d0d6685225e2d91bca87ee405a3c18 | [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 | cf2563e4396e123e0f1d7dc3d63283fb47c97056 [diff] | |
| parent | f24b7203647965c77578c2e1f43b37ca5a990e60 [diff] |
am 5d996053: am 3f68bc25: Merge "Probably fix the Mac build." * commit '5d996053586550461d175582e47dfd5c52e0c403': Probably fix the Mac build.