tree 02766774ea3e829c6e76f6e76eee7d3971fc1117
parent 6265665282a913a545606f4e8a20de8c57c3ae84
parent d83e4f15890ac6ebe0d61924bd224eb1ae8565ad
author Doug Zongker <dougz@google.com> 1411743241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411743241 +0000

am d83e4f15: support for version 2 of block image diffs

* commit 'd83e4f15890ac6ebe0d61924bd224eb1ae8565ad':
  support for version 2 of block image diffs