tree 173124c18769ae314e8a13b704cb025c4a44803c
parent 496f6e2ad656c5bb8a277e191554d16abd290b58
parent e5715521232443f01f8c0c0633cac364c8136bde
author Xia Wang <xiaw@google.com> 1322528234 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322528234 -0800

am e5715521: am 2d9f4620: Fix build

* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
  Fix build