| commit | bb70f867c9c6b22fef620b14d47dbe8acd0e13af | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Feb 03 21:20:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 03 21:20:02 2015 +0000 |
| tree | 05c79f46f7348ab455433d312e7dc4a432f52930 | |
| parent | a803b7697fd4e5285c3670ddc73c600a4f3c2d81 [diff] | |
| parent | 703237a5b0226e98230cd85cf7f14b818df961a5 [diff] |
am 703237a5: am 6c6f3967: Merge "Fix Mac build." * commit '703237a5b0226e98230cd85cf7f14b818df961a5': Fix Mac build.