tree 5a72c44e196d110faa67a127da1364f89a43b612
parent f90090d4298e3a3a89f24a76199a93838b08db89
parent fd49adbdaf3639b7e4565c6ef67bb060612e26c4
author Tao Bao <tbao@google.com> 1464740374 +0000
committer android-build-merger <android-build-merger@google.com> 1464740374 +0000

Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb
am: fd49adbdaf

* commit 'fd49adbdaf3639b7e4565c6ef67bb060612e26c4':
  Revert "imgdiff: Generate statically linked imgdiff."

Change-Id: Id391b970b3f7cda5ead0cb469b2d09379059e89d