OSDN Git Service

am 8cee1fdc: (-s ours) am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFil...
authorLeon Scroggins III <scroggo@google.com>
Mon, 17 Mar 2014 16:02:29 +0000 (16:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Mar 2014 16:02:29 +0000 (16:02 +0000)
* commit '8cee1fdc2542e5146c9b3d375819e87daeb4d1aa':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516


Trivial merge