tree 4aeb3f4b392d3067ddbfa50e317b0a5d7b3f693e
parent 5d00304996a9a071748bd74823b34c9e03bce30f
parent b0f7fc83aa649b5287a884ccf5b74fd7dcc24096
author Josh Gao <jmgao@google.com> 1452120969 +0000
committer android-build-merger <android-build-merger@google.com> 1452120969 +0000

Merge "Kill BOARD_MALLOC_ALIGNMENT." am: 988e71b2b2
am: b0f7fc83aa

* commit 'b0f7fc83aa649b5287a884ccf5b74fd7dcc24096':
  Kill BOARD_MALLOC_ALIGNMENT.