| commit | 719b0198a324582cbf2c01236bb03746475a52e0 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Sat Jan 18 15:50:37 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 18 15:50:37 2014 -0800 |
| tree | 158e128b2594aa6ecbec4348781fd39d70364a4a | |
| parent | 78af6c4c946fec01b232c92d40eb6fd202490e3e [diff] | |
| parent | 1db584b899dffca884c3842c07da189f7c9af470 [diff] |
am 1db584b8: Merge "Attempt to fix Mac build" * commit '1db584b899dffca884c3842c07da189f7c9af470': Attempt to fix Mac build