| commit | 4162cc606c05f914aefd4edfa75486767777b67a | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Mar 04 01:57:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 01:57:06 2015 +0000 |
| tree | e0a3cd74bece9535aa63e6297bea07b54f409fe2 | |
| parent | 619c52124b2b34571695deebe8f5e9d86949aea2 [diff] | |
| parent | 21b75e269e13f4e8ccec001d9de676c1d64e4644 [diff] |
am 21b75e26: am d52afdd6: Merge "(Hopefully) fix the Mac build." * commit '21b75e269e13f4e8ccec001d9de676c1d64e4644': (Hopefully) fix the Mac build.