OSDN Git Service

am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDe...
authorLeon Scroggins III <scroggo@google.com>
Fri, 7 Mar 2014 18:21:54 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 18:21:54 +0000 (18:21 +0000)
commit757ab3e6df3f884b7ea36ae021c886513a2ce2ca
treea5e6d0030e09d4d9f5dce3dd3520bd82c8f82d64
parenta6947c418129acc0815aac8aee86be0db5360232
parent48df72f7db7456304bde16a6f000fd7d45ba5d13
am 48df72f7: am 74ca3fd3: (-s ours) am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev

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