| commit | 2c5044675b1abfae08ce1c5926e02db2272692ca | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Feb 24 22:33:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 24 22:33:58 2015 +0000 |
| tree | 916338b6216dfd3331a7ea9e6919d69a507f943b | |
| parent | 4868ec8cc28f3cf53c76dd998ba102e096faa1f6 [diff] | |
| parent | d6e9a1f5a357663ce4a42155829420b263996eb3 [diff] |
am d6e9a1f5: Merge "Fix Mac build." * commit 'd6e9a1f5a357663ce4a42155829420b263996eb3': Fix Mac build.