tree 848c784f5d5b6770a11b732968ab2c9cea8d669e
parent 7caef0c70f51a4863969a537c5d5e954483304f6
parent 4ea1a52b1bbbd6e78c5909c75d773416108f5b84
author Jean-Baptiste Queru <jbq@google.com> 1282056521 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282056521 -0700

am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used.  Remove."

Merge commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84' into gingerbread-plus-aosp

* commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84':
  libpixelflinger: ARMv6 specific objects are not used.  Remove.