| commit | 5f8ad2c7ad057793cdb446c733ebee5c920c6bb3 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri May 08 23:24:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 23:24:56 2015 +0000 |
| tree | 2e8fa28b75ba304242af11c2ef7b262ecf5a781a | |
| parent | d7c56e08268110bfdd9220c08627b5c3889704e2 [diff] | |
| parent | 588c64c44fdba8e4456e9c0f58c8caeb3d75312d [diff] |
am 588c64c4: Merge "Revert "Probably fix the Mac build."" * commit '588c64c44fdba8e4456e9c0f58c8caeb3d75312d': Revert "Probably fix the Mac build."