commit | a10263ed1f1532127a135943dce993443c5dca51 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Wed Mar 04 06:23:10 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 06:23:10 2015 +0000 |
tree | fedfd717ca66554d551ba58049ee1e0e6627a8a5 | |
parent | 850e0b3affe8a1b047eeb136bf104ed8759f8dad [diff] | |
parent | ccf1cc55a4448dc43302624da07d3211356473e2 [diff] |
am ccf1cc55: Merge "Fix the mac build." * commit 'ccf1cc55a4448dc43302624da07d3211356473e2': Fix the mac build.