tree 2d57461c1c5f3e4ef1f49845f5fef724b4ecf833
parent 00613eaf8d9d640360abfd9c74901490637387e2
parent 7e500210bea6e2c608c5f837192cd9c12cbbd93e
author Stephen Hines <srhines@google.com> 1485220895 +0000
committer android-build-merger <android-build-merger@google.com> 1485220895 +0000

Merge "Properly align a packed structure." am: 24257dda48
am: 7e500210be

Change-Id: If09a200e9efa35ecc8611d087a7ba63f99f2a330