tree 71d87c49da3b728a2558755046f3097f1592c61b
parent 2346559cb437cfe8a2dbcbd3e80b546ee5980db7
parent fe33fc790a16d85ce4109a4575d6fdcd88d42023
author Nick Kralevich <nnk@google.com> 1360864749 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360864749 -0800

am fe33fc79: Merge "fix compiler warning."

# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'fe33fc790a16d85ce4109a4575d6fdcd88d42023':
  fix compiler warning.