tree 4f3393583e8c7da6b370aa3ba61d1d7714349e0b
parent 0086e668488f6d775d7f928885cee4ac45c9b507
parent f213a7b7cb7c1adc4ce6be36973f0b9e01316abb
author Mathieu Chartier <mathieuc@google.com> 1448924827 +0000
committer android-build-merger <android-build-merger@google.com> 1448924827 +0000

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

* commit 'f213a7b7cb7c1adc4ce6be36973f0b9e01316abb':
  Change LoadNativeLibrary to use GetOrCreateAllocator