| commit | c71562dd9dc73c6d6bd7ccd25e14f0fb35f95e69 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Dec 10 02:31:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 02:31:59 2014 +0000 |
| tree | 8284a2ffe6682c3f7e86a532e4a75ade53142867 | |
| parent | d86af4dc5d4e81834a9c54c9ee7ba1fe6b311e40 [diff] | |
| parent | 1dbf33b0ca240d55fea477ecfb79052d9b006b89 [diff] |
am 1dbf33b0: Merge "Fix build on mac." * commit '1dbf33b0ca240d55fea477ecfb79052d9b006b89': Fix build on mac.