tree d188460a7ca30f858d83d29324ae8e66865f2172
parent 45a31d8d9da5f24c69db39523f6f31b3b970c49a
parent aa2e7f778399d74ac5647fbade43829049d55608
author Qiwen Zhao <zhao@google.com> 1411640060 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411640060 +0000

am aa2e7f77: am 2a4f610a: (-s ours) Manual cherry-pick of ag/554094. Fixes linter errors.

* commit 'aa2e7f778399d74ac5647fbade43829049d55608':
  Manual cherry-pick of ag/554094. Fixes linter errors.