tree f5e8f087fb4367b02084791b3de75f44bb28be3a
parent b3a584f162e5e96a543ef7ec4e60231eaea64a93
parent cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f
author Doug Zongker <dougz@android.com> 1394656465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394656465 +0000

am cb1bdc9e: (-s ours) am c91612d4: Merge "remove pixelflinger from recovery"

* commit 'cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f':
  remove pixelflinger from recovery