OSDN Git Service

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)
commit861fbc99e5a7afa4cb024c119a6785b39327047a
tree10d4b58b229952ddba74c998b454b67ce35c5662
parentd7fec557ad20d08a8f25664c0882c31955dfa73a
parent1e66abfe504f1e2cb1419336c314d45a20008102
am d135b093: (-s ours) Fix broken build. (do not merge)

Merge commit 'd135b0937875b405a20f735189040d5cb4d2546d' into eclair

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