tree f2985b603220017ddb1bb52d12310823d357c6c5
parent 34e7d45fb350ac9342fd85606e62493fe00bc07f
parent 2cb1fb45c0793bee23fe49ae0a89748787c769c8
author Tianjie Xu <xunchang@google.com> 1505684723 +0000
committer android-build-merger <android-build-merger@google.com> 1505684723 +0000

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

Change-Id: Ia4d4dd1f1f0e2667d0b4bbe06c76d20663ce580f