tree 9d0e7165f522972b5359d5a2b63928eef376e97f
parent 575eafc1eabba802ea10ef93ef51f2107be41e00
parent 4cd0d582379ca9decba7ee0b99010d9a39f298de
author Mark Salyzyn <salyzyn@google.com> 1397240918 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397240918 +0000

am 4cd0d582: am 0938c6f7: Merge "warnings be gone (4/4)"

* commit '4cd0d582379ca9decba7ee0b99010d9a39f298de':
  warnings be gone (4/4)