tree 961ebb29d338db0c837c4fa8564b930afc5574cc
parent 55541cd94bd25c2e8f7f9ea8aff2603f547f2531
parent f6d04ed7b875e56ae57f24366daf981f99c6f06c
author Andy Huang <ath@google.com> 1363392662 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363392662 +0000

am f6d04ed7: fix build

* commit 'f6d04ed7b875e56ae57f24366daf981f99c6f06c':
  fix build