commit | c4affb2b4e1209b7cc3b73c2d1ffa9009d4b982e | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Fri Sep 26 19:53:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 19:53:04 2014 +0000 |
tree | 465667bd66760b9a8ff7f568fb0dc3825cdeaa18 | |
parent | a29febd13b67131a78406beaa6367504e113240e [diff] | |
parent | be0d295da912076239a1e112c4b7b94be10cf7af [diff] |
am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport." * commit 'be0d295da912076239a1e112c4b7b94be10cf7af': Don't manually link stlport.