tree 9d0e7165f522972b5359d5a2b63928eef376e97f
parent 43827aea591c2fffdb87006462a5aa7a131a25c0
parent dd01ce9c28e37d4556606f481faeec032a1fe04e
author Mark Salyzyn <salyzyn@google.com> 1397237556 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397237556 +0000

am dd01ce9c: am 52a861d2: Merge "warnings be gone."

* commit 'dd01ce9c28e37d4556606f481faeec032a1fe04e':
  warnings be gone.