OSDN Git Service

am 9f497870: Merge "Don\'t manually link stlport."
authorDan Albert <danalbert@google.com>
Fri, 26 Sep 2014 19:53:02 +0000 (19:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 26 Sep 2014 19:53:02 +0000 (19:53 +0000)
* commit '9f4978701783942e836aeab526727458e9cb1492':
  Don't manually link stlport.

1  2 
tests/camera2/Android.mk

Simple merge