tree e5d372f0d93b472d4ab2f551df24ea3e689c5516
parent 6a331b9179dd92ac35077f0982885db8067b6fc8
parent 8ce28672106956eeff6d0ed2d1d826ec192e58ee
author Brian Carlstrom <bdc@google.com> 1407272409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407272409 +0000

am 8ce28672: Merge "Make system use patchoat to relocate during runtime."

* commit '8ce28672106956eeff6d0ed2d1d826ec192e58ee':
  Make system use patchoat to relocate during runtime.