OSDN Git Service

am d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."
authorDan Albert <danalbert@google.com>
Tue, 28 Jul 2015 00:13:58 +0000 (00:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jul 2015 00:13:58 +0000 (00:13 +0000)
commit29dc917b16f0522dfaf367a70ae99186344e1f0e
tree682b4469285422aafbb2200ce4e2b815bc108ec1
parent86162e6439e8035494b187efbf138d9cabae92fb
parentd4ff228319d8382a062c9843511d760d1933a9f4
am d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."

* commit 'd4ff228319d8382a062c9843511d760d1933a9f4':
  Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.