| commit | acfd28f93b3e3909556e188eeb8ea61cfad4278a | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Sep 10 07:27:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 10 07:27:51 2014 +0000 |
| tree | a9ab758b06950dab3b439e741e2baa0115e420d5 | |
| parent | d49ee6d456cc30317c75ef0000919b1724379a88 [diff] | |
| parent | dc0e2389c59077f9ceba9924de0e6edede89a7b0 [diff] |
am dc0e2389: (-s ours) am 4d1365b4: Merge "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen" into lmp-dev * commit 'dc0e2389c59077f9ceba9924de0e6edede89a7b0': DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen