tree c6b1c35ab3212b52fd48bbe258ca96e4eb24f943
parent 365e0235398893f9b87ef3c3c58f1dddbb0c51e6
parent ed50c1817fc0ab29dcd08f1765eb50e0baa80123
author Tianjie Xu <xunchang@google.com> 1505684904 +0000
committer android-build-merger <android-build-merger@google.com> 1505684904 +0000

Merge "Fix the dangling pointer when setting up arguments of imgdiff" am: ca5a071307 am: 2cb1fb45c0
am: ed50c1817f

Change-Id: Ia8012462d20f8b6ba15b12caf9b4e9be43bb2a47