| commit | bbf1942601dcf73507c9c140adc634a1f548fa97 | [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 | 0da1f1dd9719c3f4611787b0ab14e2d31d0ab7bb [diff] | |
| parent | 97d2c7cb48eaf9390846c3f66c99a6e9f22d9a60 [diff] |
am 2c504467: am d6e9a1f5: Merge "Fix Mac build." * commit '2c5044675b1abfae08ce1c5926e02db2272692ca': Fix Mac build.