| commit | c8606b88d043fe1cb1f4ca33c918894b71a56d86 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jul 14 20:40:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:40:57 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | 328917c96fce9ead9902ab2047833be5a0889104 [diff] | |
| parent | 2dd4813d26665abc34217e78008e0572b4cb6c59 [diff] |
am 2dd4813d: am 7f0ec9ac: am bfe9d08e: Merge "Fix mac build." * commit '2dd4813d26665abc34217e78008e0572b4cb6c59':