am 4cc86ec1: gralloc: pad RGB buffers by a minimum of 2 extra lines
authorGreg Hackmann <ghackmann@google.com>
Mon, 8 Oct 2012 17:47:59 +0000 (10:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Oct 2012 17:47:59 +0000 (10:47 -0700)
* commit '4cc86ec14bdd6f9adf34b1fd7829041a5e4b84a0':
  gralloc: pad RGB buffers by a minimum of 2 extra lines


Trivial merge