tree 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c
parent 31dddb8af6f7163a8ffd8fe5b28d4ac2784bae35
parent 3fb3a4fbd0978f8b86fa9fc7d29f414faae27b62
author Daisuke Miyakawa <dmiyakawa@google.com> 1283460888 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283460888 -0700

am 3010713f: Fix again.

Merge commit '3010713f50aa6ac189b1990421cfab1d426bc601' into gingerbread-plus-aosp

* commit '3010713f50aa6ac189b1990421cfab1d426bc601':
  Fix again.