tree 615c4586e9b07a0f1014e873a7d76bfdc4241bbb
parent 736fd4a870781b9cf8a59c95fac8a518a462c49a
parent 8dd3ea58fdd99912f631156c37bcb2555ce8aec3
author Andreas Gampe <agampe@google.com> 1411688631 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411688631 +0000

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

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