tree 37b85d39756dc72c0797cb2a0243df9477add7fc
parent 0ef948d861c6a05083a3fc05d99834d00566775d
parent f358a7d12b8e02b6df24924b7e2ee4896bcb9f0c
author Tianjie Xu <xunchang@google.com> 1505685053 +0000
committer android-build-merger <android-build-merger@google.com> 1505685053 +0000

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

Change-Id: I2338d792b7f2138ff7c84093c8b88415178f6809