tree ae3eace6dbcb6c0d0663d77bc61283e2156d9091
parent 355c04dfe84b06311bdb15a1617e22bea4eb2571
parent 2a27a640d0d9747659cc609b4384ffead090866e
author Mark Salyzyn <salyzyn@google.com> 1397240787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397240787 +0000

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

* commit '2a27a640d0d9747659cc609b4384ffead090866e':
  warnings be gone (3/4)