tree c88c829df1dc9c13ec1a87d892ada72978de06ff
parent 828cff2aae61f4d33f7240c98a1d4d8ad0fcb6a8
parent b3e7aee4b21fb681cb0c1baed2c881182e21a184
author Brian Carlstrom <bdc@google.com> 1383685232 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383685232 -0800

am b3e7aee4: am c0b2d860: am 01ac9531: Merge "Treat UnsatisfiedLinkError as non-fatal"

* commit 'b3e7aee4b21fb681cb0c1baed2c881182e21a184':
  Treat UnsatisfiedLinkError as non-fatal