OSDN Git Service

am 96000a61: am 314b5c98: am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK...
authorAndrew Hsieh <andrewhsieh@google.com>
Tue, 18 Mar 2014 00:19:29 +0000 (17:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Mar 2014 00:19:29 +0000 (17:19 -0700)
* commit '96000a611a76e4b07f009066696a90cbffebda17':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared


Trivial merge