OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bf7250 e32af36)
am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may...
authorXavier Ducrohet <xav@android.com>
Wed, 27 Jul 2011 21:03:35 +0000 (14:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Jul 2011 21:03:35 +0000 (14:03 -0700)
* commit 'c682559d3c39aa4503d5c4d60ae046393aa45b79':
  DO NOT MERGE. may fix build on some version of gcc


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