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)
commite5faf231e0cca9c786492b36e4abcc648c1aec8d
treefdf9c54881924c27f873d8472f4965f27092c838
parentc9c834f9f35a54ee110bf07182ee03eabb2e9bad
parentd135b0937875b405a20f735189040d5cb4d2546d
am d135b093: (-s ours) Fix broken build. (do not merge)

Merge commit 'd135b0937875b405a20f735189040d5cb4d2546d' into eclair

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