OSDN Git Service

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

Change-Id: Iec58dd45df569d4c558ed0114b576db0f5cb101a


Trivial merge