OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a81e01a 7e77035)
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
authorXavier Ducrohet <xav@android.com>
Mon, 23 May 2011 17:22:00 +0000 (10:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 May 2011 17:22:00 +0000 (10:22 -0700)
* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
  Merge e57aa434 from honeycomb-mr1. do not merge.


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