tree 98b581b005d71bf3a636516d375da8b3f699c809
parent 1fcfb81034784ccf0515ef23c327d06969bc50f7
parent 3cba6f00cab830b54a1234bf9e4b3b69ab7f8228
author Tim Murray <timmurray@google.com> 1404837654 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404837654 +0000

am 3cba6f00: Merge "Move element and type allocations to the HAL allocator."

* commit '3cba6f00cab830b54a1234bf9e4b3b69ab7f8228':
  Move element and type allocations to the HAL allocator.