| commit | 2dd4813d26665abc34217e78008e0572b4cb6c59 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Sat Jul 12 02:06:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 02:06:18 2014 +0000 |
| tree | 8e148cb56b1d31bd7285bd4641a6c751095980b0 | |
| parent | d06e598190aeeef3e8ca8a6d9e7d97aab01efbc0 [diff] | |
| parent | 7f0ec9ac316a06b6c0b0a3966973affc92fcaafd [diff] |
am 7f0ec9ac: am bfe9d08e: Merge "Fix mac build." * commit '7f0ec9ac316a06b6c0b0a3966973affc92fcaafd': Fix mac build.