am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."

* commit '1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea': Ensure alignment of Res_png_9patch.
2015-04-09 18:31:38 +00:00
parent acae606f5d 1f799a6b96
commit e24d36b7b7
1 changed files with 1 additions and 1 deletions
--- 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) { }