Merge commit 'bc881e66d15181494fdd5d0ece83e20ef325453b' into gingerbread-plus-aosp * commit 'bc881e66d15181494fdd5d0ece83e20ef325453b': frameworks/base: Swap width and height of temporary buffer only with