tree 76a3422a43cbe75850111d2e9c629c5c632c5bfd
parent ca3593df3d48cb4b51acf89e6df4872b922fd51d
parent 1dc1fb4adc71ea9cf26a5033513bd3a1474f79a1
author Mark Salyzyn <salyzyn@google.com> 1392246633 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392246633 +0000

am 1dc1fb4a: Merge "vold: suppress unused argument warning messages"

* commit '1dc1fb4adc71ea9cf26a5033513bd3a1474f79a1':
  vold: suppress unused argument warning messages