am 89bbb846: Merge "Fix alignment after variable-length data."

* commit '89bbb846b9831f232b87d54a6eeb759ac603cc43':
  Fix alignment after variable-length data.
This commit is contained in:
Elliott Hughes 2015-07-06 22:55:21 +00:00 committed by Android Git Automerger
commit 95997b691f

Diff content is not available