Commits
Kenny Root authored and Android Git Automerger committed 09176abe673M
am fcbbaf1d: resolved conflicts for merge of e80341c8 to master * commit 'fcbbaf1d837e96e77d0ec45a050e8a41060ae7f3': Fix issue with selecting proper JNI libraries
Showing diff tofcbbaf1d837