commit f04046dfb0696113c8c1a3cf7425b7d6d85378b3
author Dan Albert <danalbert@google.com> Thu Apr 09 19:06:11 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 09 19:06:11 2015 +0000
tree e63f638dba4d37e0a44bc3f2932557acd9bf3b57
parent f75355e4df08fadc545b691f4e633aa5ff961ca6
parent e24d36b7b744540ccd3401609248ed9d48be4cc9

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

* commit 'e24d36b7b744540ccd3401609248ed9d48be4cc9':
  Ensure alignment of Res_png_9patch.

include/androidfw/ResourceTypes.h

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 @@
  *
  * 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) { }