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)
commite5d7e195f5aa757de1aa25bac690930c1cc1b5a5
treee561cb994d73fa140fc64dd478f4a9173015c013
parenta3c5fb2c0337808c2d361593ba5ccad8203f9559
parent7608d4b608d63ded4ac13039c7f192d4e739296c
am e4ddc394: am 59b2923c: am 7d1b833e: fixing build

Merge commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf'

* commit 'e4ddc394fa6285f0ebe629c51d634d1403f4d1bf':
  fixing build