tree 2b611dd169e46f94bfe41d4937956d18ac5a88df
parent 68a74ec483db4317de0e309eb63d846009b018e9
parent 8c6b9b0d95974be3ba21c133661772206bc15e39
author Kristian Monsen <kristianm@google.com> 1390939053 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390939053 +0000

am 8c6b9b0d: Merge "Fixes some warnings"

* commit '8c6b9b0d95974be3ba21c133661772206bc15e39':
  Fixes some warnings