tree 75677053eaf8b9528b8edaf3cae9dc1b70a0b0de
parent 197e4afea4600599ee18c83428cc25d2ce5fc6ca
parent d8a518d711f6958c04c28e4ee767121c201f2d9a
author Tao Bao <tbao@google.com> 1464740596 +0000
committer android-build-merger <android-build-merger@google.com> 1464740596 +0000

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

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

Change-Id: I47db6e16750e4f4c0cfa56b076871fd6729bce48