| commit | 7f0ec9ac316a06b6c0b0a3966973affc92fcaafd | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Sat Jul 12 01:42:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 01:42:16 2014 +0000 |
| tree | 62ed40d2d0f719fcff6dd299ad59c96a2a03cb17 | |
| parent | 8630388d9526ae08e003626be4a62f0e9d9485cc [diff] | |
| parent | bfe9d08e93f6b866e7ecc63f32083e3fc868e606 [diff] |
am bfe9d08e: Merge "Fix mac build." * commit 'bfe9d08e93f6b866e7ecc63f32083e3fc868e606': Fix mac build.