| commit | 6a994c7d537b4eda024b01287fae7599458fe45b | [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 | 9d7b0b1c0cf8f07a9d24d04ff4424b1656a70ff1 [diff] | |
| parent | a66a12c9568127f5e1ed58952c1fbc946fb1ba93 [diff] |
am 588c64c4: Merge "Revert "Probably fix the Mac build."" * commit '588c64c44fdba8e4456e9c0f58c8caeb3d75312d': Revert "Probably fix the Mac build."