OSDN Git Service

am dee66b44: am 96000a61: am 314b5c98: am 66a4ef8f: am d14f3cc7: am 5384c187: Merge...
authorAndrew Hsieh <andrewhsieh@google.com>
Mon, 12 May 2014 23:28:45 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:28:45 +0000 (23:28 +0000)
commite588f5c6ed9ab94c0eae91fedc2817a8f3c41e11
treedb34eca2da5ec1662b262862fc44c323209fcb14
parent9210464017eaf82d7783c7dc693dfd36df425e27
parentdee66b44dfc8ad3fdb345f3833281d9a665f9266
am dee66b44: am 96000a61: am 314b5c98: am 66a4ef8f: am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"

* commit 'dee66b44dfc8ad3fdb345f3833281d9a665f9266':