tree 01f10a8b63e09d642f3abdd99c50fa37081e02f4
parent 7ded19677462446c181af215170771eaad5101a6
parent 48fdc133a3d31d0b604ff3986b97ed89b4232ccb
author Colin Cross <ccross@android.com> 1530035976 -0700
committer android-build-merger <android-build-merger@google.com> 1530035976 -0700

Merge "Disable standalone relocation packer" am: effbc370dc am: bbbcf1c01e
am: 48fdc133a3

Change-Id: I17c77416ce9befac85e221d8364f6f37bbcd944a