tree a22acf6a21475a14200a5589960b0541d8517bdd
parent fa049a6faed593b76e986e9784d0beedc3ca4f88
parent 3d193137da53cbd1fd53e875696e0896822f604d
author Ficus Kirkpatrick <ficus@android.com> 1394159145 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394159145 +0000

am 3d193137: Merge "Clean up some warnings"

* commit '3d193137da53cbd1fd53e875696e0896822f604d':
  Clean up some warnings