tree 6bdbc2dd85be8e1b21406a3992240f78cb90befd
parent 6280ef88a9231d2a14f2b0bbe6d39770c994787d
parent a93138b7d679cc21331f098af43de6f1f4fecf5e
author Alex Light <allight@google.com> 1450395494 +0000
committer android-build-merger <android-build-merger@google.com> 1450395494 +0000

Merge "Ensure that ClassTable has correct alignment in image." am: d16bb3f0dc
am: a93138b7d6

* commit 'a93138b7d679cc21331f098af43de6f1f4fecf5e':
  Ensure that ClassTable has correct alignment in image.