tree c470c4007e11c62f6199a2236a54e56db84ac904
parent 8e904d565e8a54f755814e9ae062743b8b012731
parent bc57651fb510d7b1a2811235f96e711b6be12a12
author Leon Scroggins III <scroggo@google.com> 1394216123 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394216123 +0000

am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev

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