tree 6f676225d30771b1d8c378bd810f5b34af14357e
parent b667e8a85ffe45459f48ccb10cd87d195c1aaeab
parent 4ded4983983aa8597e927d3a7f0dc241fa993951
author Andreas Huber <andih@google.com> 1336153868 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336153868 -0700

am 4ded4983: am 9dc4c66f: Until we have emulator support for YUV12 rendering do software color conversion.

* commit '4ded4983983aa8597e927d3a7f0dc241fa993951':
  Until we have emulator support for YUV12 rendering do software color conversion.