OSDN Git Service

am cc356db5: am 5ee74388: Merge "Disallow using stlport."
authorDan Albert <danalbert@google.com>
Thu, 7 May 2015 15:58:13 +0000 (15:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 May 2015 15:58:13 +0000 (15:58 +0000)
* commit 'cc356db5531d8c769e58bf1a98fda8f95fba7eed':
  Disallow using stlport.


Trivial merge