tree ee5179d3f0ccf399d0dd04ec6f3fc934d1ef18c1
parent bbfdb779d596ef75d6ad13ed8e85d9a3b9512a5f
parent 8eb3ece8eeaea4dc06c5b3854d8fd9efea4ef5fc
author John Reck <jreck@google.com> 1378830664 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378830664 -0700

am 8eb3ece8: am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-dev

* commit '8eb3ece8eeaea4dc06c5b3854d8fd9efea4ef5fc':
  Remove FD optimization case for decodeStream