tree 56c2c1e0dcaa10b63f8378fbcd52e2c81549b0f0
parent b3f35c3842076872f54d82290132d49a9bd1c10f
parent 5633ccf042f76a894fa31fe1579846ac516fa60c
author Christopher Ferris <cferris@google.com> 1453242906 +0000
committer android-build-merger <android-build-merger@google.com> 1453242906 +0000

Merge "Allow setting an arbitrary alignment for an entry." am: ad12df20e9
am: 5633ccf042

* commit '5633ccf042f76a894fa31fe1579846ac516fa60c':
  Allow setting an arbitrary alignment for an entry.