tree efa5f1eb85cabf06529c15e59728114e37aee765
parent 9b6d5180e72b775011b152ef413bc6af2e7b539f
parent 9aec6b8422f8d153a91a241f1b10d6e48d338bb8
author Chiao Cheng <chiaocheng@google.com> 1365619967 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365619967 -0700

am 9aec6b84: Fix broken build.

* commit '9aec6b8422f8d153a91a241f1b10d6e48d338bb8':
  Fix broken build.