tree be1d3ab9a729437d0e11ae667a6bc6827a820170
parent 9e50ac12327301b2dda6b0db835fd7f26809ff3e
parent ffc2f7f3111a182e90926ed8d68efba4238fbfa4
author Brian Carlstrom <bdc@google.com> 1485418720 +0000
committer android-build-merger <android-build-merger@google.com> 1485418720 +0000

Merge "Revert "Disable -Waddress-of-packed-member temporarily."" am: e6c704418c am: ec64a7d9e3 am: f311513880
am: ffc2f7f311

Change-Id: I9a2e4e002563f5e826d619c80d3d6fadd41f766c