diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-09 18:31:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 18:31:38 +0000 |
| commit | e24d36b7b744540ccd3401609248ed9d48be4cc9 (patch) | |
| tree | 49d63fb8c960664c5fb8ae3a0c88edda2d57c4bb | |
| parent | acae606f5dde5fff990ffc840da89fcc61f03c5b (diff) | |
| parent | 1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea (diff) | |
| download | frameworks_base-e24d36b7b744540ccd3401609248ed9d48be4cc9.zip frameworks_base-e24d36b7b744540ccd3401609248ed9d48be4cc9.tar.gz frameworks_base-e24d36b7b744540ccd3401609248ed9d48be4cc9.tar.bz2 | |
am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."
* commit '1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea':
Ensure alignment of Res_png_9patch.
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 8673219..0822afd 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -112,7 +112,7 @@ struct __assertChar16Size { * * The PNG chunk type is "npTc". */ -struct Res_png_9patch +struct alignas(uintptr_t) Res_png_9patch { Res_png_9patch() : wasDeserialized(false), xDivsOffset(0), yDivsOffset(0), colorsOffset(0) { } |