OSDN Git Service

Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
authorTao Bao <tbao@google.com>
Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)
commit46ff838582efb054d228fba3c6384c9869037f38
tree428de33910efbee28cdf70d6fd36033598dcdfdd
parente000bb9be69a48dd8960e9c44db993bbcec06e3f
parenta8d3741f1a55990cc4cc58f7d4db87e13527c776
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am: a8d3741f1a

Change-Id: If8392b72a865f53449a1d5ca7b52de7697c4b412
tools/releasetools/common.py
tools/releasetools/ota_from_target_files.py