tree ba07c00c403cb427f68abb7a6fa0a148724eb067
parent 3a3f47e53188f15a68d22392958ede741d71fa0f
parent 03ce5b536647853cbfa65357760f3fb246b85e36
author Ying Wang <wangying@google.com> 1367016975 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367016975 -0700

am 03ce5b53: Fix build.

* commit '03ce5b536647853cbfa65357760f3fb246b85e36':
  Fix build.