tree a6e2519348e70f106aa89eb1bef673edca0ea93e
parent e7b92260e228039295874bea024b629cb5a4d89a
parent 1d62c7737c33f92e79f0a180b05969f52484e64c
author Chung-yih Wang <cywang@google.com> 1281067806 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281067806 -0700

am 1d62c773: Fix the build

Merge commit '1d62c7737c33f92e79f0a180b05969f52484e64c' into gingerbread-plus-aosp

* commit '1d62c7737c33f92e79f0a180b05969f52484e64c':
  Fix the build