| commit | b87691e944117fcf4205456bfcb7972073279a57 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 26 01:14:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 26 01:14:30 2015 +0000 |
| tree | 6fb5d2941e25452d8e35d4d635795ad05963f91a | |
| parent | e792c3e622b9e4a8ae063be98052bdb251cb3697 [diff] | |
| parent | 54b01b8017874a93a9fcc0a18f863b351e3ae596 [diff] |
am 615af25f: am a421c1e5: Merge "Possible Mac build fix." * commit '615af25ffdde99331c173499446e08c3a7ec32a8': Possible Mac build fix.