am 95997b69: (-s ours) am 89bbb846: Merge "Fix alignment after variable-length data."

* commit '95997b691f788c06b68710ad015c9dc668e7b91f':
This commit is contained in:
Elliott Hughes 2015-08-27 05:02:49 +00:00 committed by Android Git Automerger
commit 0746d0f175

Diff Content Not Available