| commit | 026658d5da328108761a1586cabc339917e565ba | [log] [tgz] |
|---|---|---|
| author | Dave Allison <dallison@google.com> | Sat Jul 12 01:42:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 01:42:13 2014 +0000 |
| tree | 31f86937961622469a80ac238147df142a80465e | |
| parent | 5731206b6443eb90b6b16573c4592393e7ceb0db [diff] | |
| parent | 1190e0e48ae9f60383c02e1c30f3b9a7b01d5de4 [diff] |
am 1190e0e4: Merge "Fix mac build" * commit '1190e0e48ae9f60383c02e1c30f3b9a7b01d5de4': Fix mac build