tree dfb466d80dea6b61be36eaf54ae98d607f29fc83
parent 71be88734a3d84a29f21fa020305d59b8431b9a4
parent 137d85333e2bae3ed3928fee155ac865f58273c9
author Tianjie Xu <xunchang@google.com> 1490229801 +0000
committer android-build-merger <android-build-merger@google.com> 1490229801 +0000

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

Change-Id: I3ce3450f8385ef18f71491608da88184f3885730