tree b10af0a925024ad8e6b5bc3939ebda227bd76c18
parent 27786445aa50d7082071baf5eba356348079e167
parent 456d5c686052ee37b0aec50861d05237187dc097
author Mathieu Chartier <mathieuc@google.com> 1448933545 +0000
committer android-build-merger <android-build-merger@google.com> 1448933545 +0000

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

* commit '456d5c686052ee37b0aec50861d05237187dc097':
  Revert "Change LoadNativeLibrary to use GetOrCreateAllocator"