| commit | 45aba63dfd2fbd184b9f452ed23dc9932c515451 | [log] [tgz] |
|---|---|---|
| author | Dave Allison <dallison@google.com> | Mon Jul 14 20:40:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:40:46 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | 020d7b501b5a1344b21c22891877cf901013ba34 [diff] | |
| parent | 4329b3cecc611cc733b01ea26f04711dd31a3be1 [diff] |
am 4329b3ce: am 026658d5: am 1190e0e4: Merge "Fix mac build" * commit '4329b3cecc611cc733b01ea26f04711dd31a3be1':