tree 7c91432f4dff0dfec2d6f10fa5c4b08226ce29c3
parent 6a575430e4697c5879457e6ecf6486e313890173
parent f694ba5f7fa81f250045c107e919888661a734ae
author Colin Cross <ccross@android.com> 1342579239 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342579239 -0700

am f694ba5f: Merge changes I6c59381c,I0da088fc,I883572f5,Idc2cfe20,I1a156d10,I177abdb9,I18707bd9,I26744c74,I266f70e1,I75f10db2,I95aa2317,I2f21355b,I5d4ab07f,Ic138ad58,I012d8a42,If664e4fc

* commit 'f694ba5f7fa81f250045c107e919888661a734ae':
  fastboot: add support for auto-resparsing large files
  fastboot: add fb_getvar
  fastboot: use getopt_long
  libsparse: rename symbols that conflict with libext4_utils
  libsparse: add sparse_file_len
  libsparse: add function to resparse a file and a utility to use it
  libsparse: add callback output file type
  libsparse: pseudo-subclass output_file for normal and gz files
  libsparse: add sparse_file read and convert tools to use it
  libsparse: fix windows image writing
  libsparse: merge adjacent blocks of the same type
  libsparse: add error reporting functions
  libsparse: add support for including fds
  libsparse: cleanups
  libsparse: remove static variables
  system/core: move libsparse into system/core