tree 4f3393583e8c7da6b370aa3ba61d1d7714349e0b
parent a656433d3b93a3dc1428d008114490e62b70b41b
parent 2e57aca33bd22cac7c0e66bdc11a90163b1718e9
author Mathieu Chartier <mathieuc@google.com> 1448924641 +0000
committer android-build-merger <android-build-merger@google.com> 1448924641 +0000

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

* commit '2e57aca33bd22cac7c0e66bdc11a90163b1718e9':
  Change LoadNativeLibrary to use GetOrCreateAllocator