| commit | 60dcea119041b540ed4328cb74cf1b5d8903783e | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Sep 26 19:57:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 19:57:59 2014 +0000 |
| tree | 80bb9c4fd1fb6a408949786cfb7dca53cc8ffa29 | |
| parent | 63f705212249fc70b6e15617635188e50461d223 [diff] | |
| parent | 31171b6e3155ac075a37aeb28da1a06faeb15276 [diff] |
am 31171b6e: am be0d295d: am 19d686ee: Merge "Don\'t manually link stlport." * commit '31171b6e3155ac075a37aeb28da1a06faeb15276': Don't manually link stlport.