| commit | 884116c84aecd9d6685398e2735d6422909bb104 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Sat Jan 18 23:52:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 18 23:52:11 2014 +0000 |
| tree | 33ee273a3596631bed51bbe632be6cf0ad1e78d8 | |
| parent | 555376331f436fb519c182677c22d8299ead5523 [diff] | |
| parent | 719b0198a324582cbf2c01236bb03746475a52e0 [diff] |
am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build" * commit '719b0198a324582cbf2c01236bb03746475a52e0': Attempt to fix Mac build