tree ca8b93da8be13d730ab88b4d4fe49144465d67a6
parent 679841d2be9bd513c8b6655bb06685ed3ecff469
parent e51e3f988ba91f0469757738fa55f835e16e37d9
author Mathieu Chartier <mathieuc@google.com> 1448933183 +0000
committer android-build-merger <android-build-merger@google.com> 1448933183 +0000

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

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