tree 9e4357aa169dac1a093adc1ffc70d12d71f59c6d
parent b39a90f0bc224eeb43972b4f7a3dd651ae70b6f8
parent eb0623b14b2935cd247e04ead6af1ef5e4618d43
author Tianjie Xu <xunchang@google.com> 1490229951 +0000
committer android-build-merger <android-build-merger@google.com> 1490229951 +0000

Merge "Remove malloc in edify functions" am: 1ea869b0c6 am: 137d85333e
am: eb0623b14b

Change-Id: I7c48105d9259b1713e8be5fb2c50ef8d6a92c993