OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0bf836 9a59d41)
am 9a59d411: am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."
authorElliott Hughes <enh@google.com>
Thu, 22 May 2014 01:53:48 +0000 (01:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 May 2014 01:53:48 +0000 (01:53 +0000)
* commit '9a59d411cbe68d6027c541854c6d7c1348e4ee3d':
  Restore accidentally-removed NULL timeout.


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