tree 1978ce15d6ef9b151f288f25d6fe947ea6d585ee
parent 741c16686ebc9ac4d326a3942b437df9e7241e06
parent 6d6ba8aaf19b3f5cb209c0b60c7bfd1900411945
author Dan Albert <danalbert@google.com> 1447377504 +0000
committer android-build-merger <android-build-merger@google.com> 1447377504 +0000

Merge "Allow globally disabling the relocation packer."
am: 6d6ba8aaf1

* commit '6d6ba8aaf19b3f5cb209c0b60c7bfd1900411945':
  Allow globally disabling the relocation packer.