tree dfb466d80dea6b61be36eaf54ae98d607f29fc83
parent deb2a29a4279e23cfa635232935b4265ff84f06a
parent 1ea869b0c6b6287989f98ed16103a246fe9ae64a
author Tianjie Xu <xunchang@google.com> 1490229650 +0000
committer android-build-merger <android-build-merger@google.com> 1490229650 +0000

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

Change-Id: I1501b6a92e49a12f168a63b87a89a57eb13c262d