diff options
| author | Dan Albert <danalbert@google.com> | 2015-04-09 19:06:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 19:06:11 +0000 |
| commit | f04046dfb0696113c8c1a3cf7425b7d6d85378b3 (patch) | |
| tree | e63f638dba4d37e0a44bc3f2932557acd9bf3b57 /include | |
| parent | f75355e4df08fadc545b691f4e633aa5ff961ca6 (diff) | |
| parent | e24d36b7b744540ccd3401609248ed9d48be4cc9 (diff) | |
| download | frameworks_base-f04046dfb0696113c8c1a3cf7425b7d6d85378b3.zip frameworks_base-f04046dfb0696113c8c1a3cf7425b7d6d85378b3.tar.gz frameworks_base-f04046dfb0696113c8c1a3cf7425b7d6d85378b3.tar.bz2 | |
am e24d36b7: am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."
* commit 'e24d36b7b744540ccd3401609248ed9d48be4cc9':
Ensure alignment of Res_png_9patch.
Diffstat (limited to 'include')
| -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 a5776a4..da70e9b 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) { } |