tree 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c
parent 09c74ae8e59a44b8b7538b31b397fcb4af77df1c
parent d937746ca52e85bfb7c4fe5befe4b80d22799d36
author Andreas Huber <andih@google.com> 1283377992 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283377992 -0700

am 81f339bc: Merge "Fixing the build." into gingerbread

Merge commit '81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp

* commit '81f339bcfeee5dccb284cdeac6941179f91fe08b':
  Fixing the build.