| commit | 5d0e8a83b0df9b3ca02943d87169a53dc25e5816 | [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 | e49235fb4c5e234db3ae01e11ba84f1e2a72d1bf [diff] | |
| parent | 5f8ad2c7ad057793cdb446c733ebee5c920c6bb3 [diff] |
am 5f8ad2c7: am 588c64c4: Merge "Revert "Probably fix the Mac build."" * commit '5f8ad2c7ad057793cdb446c733ebee5c920c6bb3': Revert "Probably fix the Mac build."