OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7fec55 1e66abf)
am d135b093: (-s ours) Fix broken build. (do not merge)
authorDianne Hackborn <hackbod@google.com>
Wed, 30 Sep 2009 01:07:48 +0000 (18:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2009 01:07:48 +0000 (18:07 -0700)
Merge commit 'd135b0937875b405a20f735189040d5cb4d2546d' into eclair

* commit 'd135b0937875b405a20f735189040d5cb4d2546d':
  Fix broken build. (do not merge)


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