am 71512bf9: am c41b757c: gralloc: add extra line of padding after aligning
authorGreg Hackmann <ghackmann@google.com>
Thu, 30 Aug 2012 22:01:21 +0000 (15:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Aug 2012 22:01:21 +0000 (15:01 -0700)
* commit '71512bf9c475f7c3070a6254864baea1daa55c65':
  gralloc: add extra line of padding after aligning


Trivial merge