| commit | 9b2aba07335200f8a4e676b455706f165ee89ae0 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Mar 23 21:55:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 21:55:49 2015 +0000 |
| tree | d6543368a81783030ee3a2aef6f7bd4aecb6e8fa | |
| parent | 91080a4296da52eeb935410a25e79a78ebcc4c5b [diff] | |
| parent | ec57440878476149468a014bd41acef27ceb8789 [diff] |
am ec574408: Merge "(Probably) fix the mac build." * commit 'ec57440878476149468a014bd41acef27ceb8789': (Probably) fix the mac build.