OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38d12b0 757ab3e)
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)
* commit '757ab3e6df3f884b7ea36ae021c886513a2ce2ca':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help