tree 4aebfee33ca306efd1e3bdd56bf52a53a1772124
parent 54d5b2e6700e4eac29d94a24acd854fabc96bddc
parent ea52030bc6819c7ea6ffc921df9c3f13b7f8b94c
author Andreas Gampe <agampe@google.com> 1411692372 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411692372 +0000

am ea52030b: (-s ours) am 8dd3ea58: Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev

* commit 'ea52030bc6819c7ea6ffc921df9c3f13b7f8b94c':
  Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"