OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2c8b65 73b607f)
am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some versio...
authorXavier Ducrohet <xav@google.com>
Wed, 29 Jun 2011 01:56:14 +0000 (18:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jun 2011 01:56:14 +0000 (18:56 -0700)
* commit 'e0947693c9984727dfa775a747dd32aaaeb90284':
  DO NOT MERGE. may fix build on some version of gcc


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