tree 9d0e7165f522972b5359d5a2b63928eef376e97f
parent 4edb2205c8a82eebec0b0d390cf2a0df507d3645
parent 8819b515f541daea4288a87cfbae37561cb80b13
author Mark Salyzyn <salyzyn@google.com> 1397240917 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397240917 +0000

am 8819b515: am 2a27a640: Merge "warnings be gone (3/4)"

* commit '8819b515f541daea4288a87cfbae37561cb80b13':
  warnings be gone (3/4)