OSDN Git Service

am d69ec35b: am 1aa6708c: Fix the build. Oops.
authorDavid 'Digit' Turner <digit@google.com>
Tue, 12 Oct 2010 08:45:28 +0000 (01:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Oct 2010 08:45:28 +0000 (01:45 -0700)
commit2410512c4ff29ff9375640261dd7e07fc308930d
tree429b9ab4461aa84e57a36152abeb9d8d4dd1bb1e
parent364462ea2ee025043a6a2d951961a95c20867e45
parentd69ec35bef0d3aa11bfb55501951eed8c3042fda
am d69ec35b: am 1aa6708c: Fix the build. Oops.

Merge commit 'd69ec35bef0d3aa11bfb55501951eed8c3042fda'

* commit 'd69ec35bef0d3aa11bfb55501951eed8c3042fda':
  Fix the build. Oops.