tree 0066a7b6413dc91c793ccc57f6efb1b998b7b79e
parent 51dc9444bcf8d8900a521795e873d07f6cd445ef
parent 197e4afea4600599ee18c83428cc25d2ce5fc6ca
author Tao Bao <tbao@google.com> 1464735628 +0000
committer android-build-merger <android-build-merger@google.com> 1464735628 +0000

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

* commit '197e4afea4600599ee18c83428cc25d2ce5fc6ca':
  imgdiff: Generate statically linked imgdiff.

Change-Id: I7ac7ab9d25cb95ced69d98d4c33349a2590a446a