| commit | 696194bcb7ae71b8c0a6445a39ee4b789ad5b7ca | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Mon Oct 27 04:34:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 04:34:09 2014 +0000 |
| tree | 2e5138cb847345030e5db2505a3b3123063251a4 | |
| parent | 3485dbecc6ef6a94718ac7c2a1dfd6e21dd3e403 [diff] | |
| parent | 4ff0fb1f4c5fae37de6aab8f2698bf5b01aa4d74 [diff] |
am 4ff0fb1f: am 98b8aaf3: am 9f497870: Merge "Don\'t manually link stlport." * commit '4ff0fb1f4c5fae37de6aab8f2698bf5b01aa4d74':