tree 83d3dbed615bc601ce5bf18eb9c1fcdcb4555438
parent 045ed665197ed3ba0681db173a058a55662cd16a
parent 74ca3fd34dac9674f61313594e2863ffecd79c7a
author Leon Scroggins III <scroggo@google.com> 1394216315 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394216315 +0000

am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev

* commit '74ca3fd34dac9674f61313594e2863ffecd79c7a':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516