tree f92ceb8901ed8464bbd984f618690ae124c961af
parent 4926df7b5ff1e6f4109817d5a716d6e57ab91ea4
parent 0e6a7f18382498fb0b82f263c4db2d2b7653d5a9
author Tianjie Xu <xunchang@google.com> 1490506408 +0000
committer android-build-merger <android-build-merger@google.com> 1490506408 +0000

Merge "Fix unittest for blockimgdiff" am: 36bcb78eb9
am: 0e6a7f1838

Change-Id: I002d5aae7bf8d6e14ba5b4882a3fdd8b4f93f555