| commit | 615af25ffdde99331c173499446e08c3a7ec32a8 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 26 01:01:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 01:01:18 2015 +0000 |
| tree | b014f1c38731986048e8bf37c4f9411b29a52be7 | |
| parent | 9492db23b9feeb589be36fece46e55dc66d7f1dd [diff] | |
| parent | a421c1e5bc32ef29bdfa8d065f27b7ea950f12a2 [diff] |
am a421c1e5: Merge "Possible Mac build fix." * commit 'a421c1e5bc32ef29bdfa8d065f27b7ea950f12a2': Possible Mac build fix.