OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d58d3c2 724e6d0)
am b0994ed7: (-s ours) CherryPick 35530d from master to mr0. do not merge.
authorXavier Ducrohet <xav@android.com>
Mon, 24 Oct 2011 20:20:07 +0000 (13:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Oct 2011 20:20:07 +0000 (13:20 -0700)
* commit 'b0994ed7ffd31d02b9d66a470decfdfaf0d6f8ee':
  CherryPick 35530d from master to mr0. do not merge.


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