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