commit | 31171b6e3155ac075a37aeb28da1a06faeb15276 | [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 | 2265f5da8c524258a6804b5bea1bba566be38173 | |
parent | a8996fddaa06aa9294be345f41e0955f2f7c745f [diff] | |
parent | be0d295da912076239a1e112c4b7b94be10cf7af [diff] |
am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport." * commit 'be0d295da912076239a1e112c4b7b94be10cf7af': Don't manually link stlport.