commit | 01ba75828232da74cc066df5376812f3387676b9 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Wed Feb 25 16:52:27 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 16:52:27 2015 +0000 |
tree | 916338b6216dfd3331a7ea9e6919d69a507f943b | |
parent | 7998e6c50f94486d4ac9bb268d73a73c6eb5d592 [diff] | |
parent | 2c5044675b1abfae08ce1c5926e02db2272692ca [diff] |
am 2c504467: am d6e9a1f5: Merge "Fix Mac build." * commit '2c5044675b1abfae08ce1c5926e02db2272692ca': Fix Mac build.