OSDN Git Service

am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static...
authorAndrew Hsieh <andrewhsieh@google.com>
Tue, 18 Mar 2014 00:11:27 +0000 (00:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Mar 2014 00:11:27 +0000 (00:11 +0000)
commit314b5c98cbd68d11e7484b5e35a1bea466cde66b
tree2580014645df0fc7786ea453867050bcbea8f4f9
parentdf0c90d0e544c9353df0135a23643aea043a9f4b
parent66a4ef8f754b73f3e45d5b87a09fcc3655cda7f3
am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

* commit '66a4ef8f754b73f3e45d5b87a09fcc3655cda7f3':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared