OSDN Git Service

Merge "Properly align a packed structure." am: 24257dda48 am: 7e500210be am: bfee6aee59
authorStephen Hines <srhines@google.com>
Tue, 24 Jan 2017 02:26:43 +0000 (02:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 Jan 2017 02:26:43 +0000 (02:26 +0000)
am: e226d82702

Change-Id: I3c9e07e48928390a98c01299fd16d58154f34150


Trivial merge