tree d80f529bba953cec247f35cdf67c136e3d5e7c49
parent 1f8243c99bd3e37a10767bf93d7404ebe8f2e916
parent c16cddd6bcf0ca768dc8d23a18c1be68c944d9ef
author Conley Owens <cco3@android.com> 1390014305 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390014305 -0800

am c16cddd6: Merge "Semi-initial commit for xdelta3, a file diffing tool."

* commit 'c16cddd6bcf0ca768dc8d23a18c1be68c944d9ef':
  Semi-initial commit for xdelta3, a file diffing tool.