tree ef66bbdc3f30b4bfcf348c21541d9e35c8b4700a
parent 994bacf5496ba07240f70611b6c565f0dc24ca0c
parent f90090d4298e3a3a89f24a76199a93838b08db89
author Tao Bao <tbao@google.com> 1464735424 +0000
committer android-build-merger <android-build-merger@google.com> 1464735424 +0000

Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57
am: f90090d429

* commit 'f90090d4298e3a3a89f24a76199a93838b08db89':
  imgdiff: Generate statically linked imgdiff.

Change-Id: I38e6ba8e896d7bfe97351673a1f5e5da1ff4708f