| commit | 043cfc08c56c6aba496f149a55ddff2e9212f332 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sun Nov 02 16:29:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 16:29:42 2014 +0000 |
| tree | 79c5c010f567ffeebd2bf4fdf423bceb4212e90e | |
| parent | 458efc0bdc8ce012263a132fd5320fc8a6937258 [diff] | |
| parent | 1935663248f9c84ce3f1fd8f9a9b15b0e38ddc70 [diff] |
am 19356632: am 24dfaac4: am c6dead70: Merge "maybe fix mac build" * commit '1935663248f9c84ce3f1fd8f9a9b15b0e38ddc70': maybe fix mac build