tree 9d0e7165f522972b5359d5a2b63928eef376e97f
parent 36bf19b05dcb964fb2840f4e9e0d93ed9941dbfc
parent 355c04dfe84b06311bdb15a1617e22bea4eb2571
author Mark Salyzyn <salyzyn@google.com> 1397240916 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397240916 +0000

am 355c04df: am 79724856: Merge "warnings be gone (2/4)"

* commit '355c04dfe84b06311bdb15a1617e22bea4eb2571':
  warnings be gone (2/4)