| commit | a9ad08e81f25f4bc9d6e96e56c562916e202d63e | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri May 08 23:37:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 23:37:17 2015 +0000 |
| tree | d0421bdc8c370f4b7b279765615774d70be4b741 | |
| parent | d8607ba15ff3b02209d5c2bb892d47f05c72ee27 [diff] | |
| parent | 6a994c7d537b4eda024b01287fae7599458fe45b [diff] |
am 5f8ad2c7: am 588c64c4: Merge "Revert "Probably fix the Mac build."" * commit '5f8ad2c7ad057793cdb446c733ebee5c920c6bb3': Revert "Probably fix the Mac build."