OSDN Git Service

am 757ab3e6: am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE...
authorLeon Scroggins III <scroggo@google.com>
Fri, 7 Mar 2014 18:25:32 +0000 (18:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 18:25:32 +0000 (18:25 +0000)
commitdbc7a4653f2a50863788bef0c3ac67acc35fc5ab
tree024c817926f26dbcbd69c48fa81e1606a259fc42
parent38d12b07e7483764749359a6f5aaebbf13d99f39
parent757ab3e6df3f884b7ea36ae021c886513a2ce2ca
am 757ab3e6: am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev

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