From: Andrew Hsieh <andrewhsieh@google.com>
Date: Tue, 18 Mar 2014 00:19:29 +0000 (-0700)
Subject: am 96000a61: am 314b5c98: am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK... 
X-Git-Tag: android-x86-6.0-r1~1638^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dee66b44;p=android-x86%2Fbuild.git

am 96000a61: am 314b5c98: am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

* commit '96000a611a76e4b07f009066696a90cbffebda17':
  Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
---

dee66b44dfc8ad3fdb345f3833281d9a665f9266