tree e63f638dba4d37e0a44bc3f2932557acd9bf3b57
parent f75355e4df08fadc545b691f4e633aa5ff961ca6
parent e24d36b7b744540ccd3401609248ed9d48be4cc9
author Dan Albert <danalbert@google.com> 1428606371 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428606371 +0000

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

* commit 'e24d36b7b744540ccd3401609248ed9d48be4cc9':
  Ensure alignment of Res_png_9patch.