tree 52f2f4f98e104824645c297fdb2c94b67f8e1a10
parent 679572ca969b9bf27786cff2123ec466b9a37222
parent 6422ee7105cc99f389ff8f09d51e2a874e97f470
author Yang Ni <yangni@google.com> 1428363941 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428363941 +0000

am 6422ee71: Merge "Rewrote FieldPack::createFieldPack for alignment"

* commit '6422ee7105cc99f389ff8f09d51e2a874e97f470':
  Rewrote FieldPack::createFieldPack for alignment