| commit | e01a75253e309ae7607d0b38a0519d3df6cc448a | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri May 08 23:49:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 23:49:14 2015 +0000 |
| tree | 8a2d9c84397388ceb08aaed39c2cf87fdeec0aad | |
| parent | 122407d62f2e79957ff4849b5b8006fb389f43fd [diff] | |
| parent | a9ad08e81f25f4bc9d6e96e56c562916e202d63e [diff] |
am 5d0e8a83: am 5f8ad2c7: am 588c64c4: Merge "Revert "Probably fix the Mac build."" * commit '5d0e8a83b0df9b3ca02943d87169a53dc25e5816': Revert "Probably fix the Mac build."