OSDN Git Service

am fcbbaf1d: resolved conflicts for merge of e80341c8 to master
authorKenny Root <kroot@google.com>
Fri, 13 Jan 2012 22:16:21 +0000 (14:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Jan 2012 22:16:21 +0000 (14:16 -0800)
commit4be2375118873f95b0fd4c9deab6efb36997043d
treefd06cc65f8cea96b0a6bca3b77464fa1101f22cb
parent100a5164b52dd46b81d2a534f4342ee4c4d323f6
parenteb051e35e94c3d56a787f667a92f757727b6ed1d
am fcbbaf1d: resolved conflicts for merge of e80341c8 to master

* commit 'fcbbaf1d837e96e77d0ec45a050e8a41060ae7f3':
  Fix issue with selecting proper JNI libraries