tree ca8b93da8be13d730ab88b4d4fe49144465d67a6
parent eec0132c41ad3e1c3f8daf2996824a593429577c
parent de75505933a7c8e3a8076d445e1510f321cc4296
author Mathieu Chartier <mathieuc@google.com> 1448933351 +0000
committer android-build-merger <android-build-merger@google.com> 1448933351 +0000

Merge "Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"" am: e51e3f988b
am: de75505933

* commit 'de75505933a7c8e3a8076d445e1510f321cc4296':
  Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"