tree 173124c18769ae314e8a13b704cb025c4a44803c
parent b54980d1d4d903f68cdfa952256afff01902cd94
parent 2d9f4620625405b916aa27177a6b5f82f8e5b15d
author Xia Wang <xiaw@google.com> 1322528030 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322528030 -0800

am 2d9f4620: Fix build

* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
  Fix build