tree 8e7f706c3019779deef9a643f074fab356261c69
parent 40bcc3bce081cafeaf885c42c9c5332c278ae4ac
parent 8cdf72066b1bf5cdb198427bde484ef7238f3390
author Sami Tolvanen <samitolvanen@google.com> 1426245795 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426245795 +0000

am 8cdf7206: (-s ours) Merge "Change transfer list format to include block hashes"

* commit '8cdf72066b1bf5cdb198427bde484ef7238f3390':
  Change transfer list format to include block hashes