OSDN Git Service

am e4ddc394: am 59b2923c: am 7d1b833e: fixing build
authorMegha Joshi <mjoshi@google.com>
Fri, 4 Dec 2009 12:22:09 +0000 (04:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 12:22:09 +0000 (04:22 -0800)
Merge commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf'

* commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf':
  fixing build


Trivial merge