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