| commit | 24dfaac494de3a31e1cd106becc2b2ad38e13bbe | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sun Nov 02 14:25:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 14:25:08 2014 +0000 |
| tree | 216fe88f56f18730057d14647f1f9fa44da4fa83 | |
| parent | 8dac3559dd61bb428db401dc7a7e69bd85943394 [diff] | |
| parent | c6dead707de7c03bd9759b61143dd33cb1435cbc [diff] |
am c6dead70: Merge "maybe fix mac build" * commit 'c6dead707de7c03bd9759b61143dd33cb1435cbc': maybe fix mac build