| commit | 3510a92cffa53f46b847f8e472610e0eca0e7efe | [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 | fdd5d9e884f3e40a655b47a4dfcf060ab0df1c22 [diff] | |
| parent | bd7b929291cd27e77acc24625790b3760f47b5d0 [diff] |
am ec574408: Merge "(Probably) fix the mac build." * commit 'ec57440878476149468a014bd41acef27ceb8789': (Probably) fix the mac build.