| commit | 1e569c1036d061d4c9b4088292c8024e93873705 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri May 09 21:53:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 21:53:57 2014 +0000 |
| tree | a24d78e4b9b4a97b527d729394d22a9a1cd0a285 | |
| parent | ee15ddee7277bdf2208642fd86307f1464b385f4 [diff] | |
| parent | 8ad708c56570d81def649911bdfc42f5c350e4b8 [diff] |
am 8ad708c5: (-s ours) am c1087e55: am bf6c2dbe: Merge "Fix mac build." * commit '8ad708c56570d81def649911bdfc42f5c350e4b8': Fix mac build.