tree 81cf53a4c11e350638f9af1369e417e326b88829
parent 679287abc607ccc6eab7b838cf2265f2e3d9e76c
parent ced7b68fa7bf2323c53bac3f02e2fcbfd1a90efd
author Mathieu Chartier <mathieuc@google.com> 1448924973 +0000
committer android-build-merger <android-build-merger@google.com> 1448924973 +0000

Merge "Change LoadNativeLibrary to use GetOrCreateAllocator" am: 2e57aca33b am: f213a7b7cb
am: ced7b68fa7

* commit 'ced7b68fa7bf2323c53bac3f02e2fcbfd1a90efd':
  Change LoadNativeLibrary to use GetOrCreateAllocator