| commit | c1087e55c63f2c206eae676fd4c237585a64e8e5 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri May 09 18:16:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 18:16:29 2014 +0000 |
| tree | 7a3de08fdbe061c6e2ff8f847c7da4ac619185fc | |
| parent | 66e31dc51e0d8db595cc1514527c4db6f5cdeba7 [diff] | |
| parent | bf6c2dbef5ab775f7c6af6a2776793c2af41bc40 [diff] |
am bf6c2dbe: Merge "Fix mac build." * commit 'bf6c2dbef5ab775f7c6af6a2776793c2af41bc40': Fix mac build.