| commit | 4970c0dcfaf3aa0215a4e67e6e97afeabf3ace98 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 12 16:22:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 16:22:11 2014 +0000 |
| tree | 70bec9d59a58c630697687dd29a4495301cfdaa6 | |
| parent | c7a7e058e83dde47089502933de4e7b65aa47734 [diff] | |
| parent | 264f08d8b8a152a9ea2445b05602ea50d90d1f1c [diff] |
am 264f08d8: Merge "Don\'t manually link stlport." * commit '264f08d8b8a152a9ea2445b05602ea50d90d1f1c': Don't manually link stlport.