tree 7d0da1ce701c7dac1a59e1eda1fc2616306e9bbb
parent c04a20613a0e438e4dcdafc2632470fbee47c3f3
parent 283ec6256bdde5685f224efdc67a061cc611b33a
author Dmitriy Ivanov <dimitry@google.com> 1400101641 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400101641 +0000

am 283ec625: am 6897b7b8: Merge "Fix for linker allocator"

* commit '283ec6256bdde5685f224efdc67a061cc611b33a':
  Fix for linker allocator