tree 5b8e0fe33bf45b4581de41730a61b0405f1caea4
parent 56ccd5d207b5c592f03a0355059765dcf10a09ec
parent 5599726a4e46ec9dc141e508efaa8d7990d4eab6
author The Android Automerger <android-build-merger@google.com> 1480737951 +0000
committer The Android Automerger <android-build-merger@google.com> 1480737951 +0000

Manually merge commit '61e74d7' into stage-aosp-master

* commit '61e74d7':
  libsparse: add a function to retrieve the data blocks

BUG:33304034wq