| commit | 1935663248f9c84ce3f1fd8f9a9b15b0e38ddc70 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sun Nov 02 14:32:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 14:32:19 2014 +0000 |
| tree | 3c8c8a4fea30f8d0f41eccddd4f80e90907fbc1e | |
| parent | 7a59c852c23695e2629ec52a70816a0f976868c2 [diff] | |
| parent | 24dfaac494de3a31e1cd106becc2b2ad38e13bbe [diff] |
am 24dfaac4: am c6dead70: Merge "maybe fix mac build" * commit '24dfaac494de3a31e1cd106becc2b2ad38e13bbe': maybe fix mac build