tree c27deaacb51e42ff6407d521b9834e637bfa465a
parent 74d6b323b1a9933a3a8b4baae508aea58a83a51b
parent 5e289b2bca7a0bc67fcf00a1017d70db8b363113
author Alex Light <allight@google.com> 1439832589 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439832589 +0000

am 5e289b2b: Merge "Make patchoat match offset when given a patched image"

* commit '5e289b2bca7a0bc67fcf00a1017d70db8b363113':
  Make patchoat match offset when given a patched image