tree a1e52df4cb2b69ac028bb1da45c65a37a96365fb
parent 5436d53d203ad2f97b335bb7ab91c1f06a417f0d
parent 3c07bb645914e9b821c4d3f8945299256e2b91c7
author Gilles Debunne <debunne@google.com> 1282937027 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282937027 -0700

am 445ab76c: Merge "Broken build. Missing ;" into gingerbread

Merge commit '445ab76c49779998543bb78881f5d9f8ae81e598' into gingerbread-plus-aosp

* commit '445ab76c49779998543bb78881f5d9f8ae81e598':
  Broken build. Missing ;