commit | e6510f1c59863fe8d9d3f6d335adea18d7ed47da | [log] [tgz] |
---|---|---|
author | Ian Rogers <irogers@google.com> | Thu May 29 10:02:25 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 29 10:02:25 2014 +0000 |
tree | 9d5de85848329c642530920d2f4d4f78b486c564 | |
parent | f54bbf7b72b9c74eb0c7b4114624775a2d582673 [diff] | |
parent | 079e6e4cfbd1a0b1ab2e94e6d52a7304321ae597 [diff] |
am 079e6e4c: Merge "Revert "Fix the mac build."" * commit '079e6e4cfbd1a0b1ab2e94e6d52a7304321ae597': Revert "Fix the mac build."