tree e8aea609c0e0822fe39dd8820c3cb53706299757
parent 3e971277db0d87652af5622c989233e7159ab909
parent 49dd24c238e86c57e97f919af7fbf8ee3d79b737
author Mark Salyzyn <salyzyn@google.com> 1392250794 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392250794 +0000

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

* commit '49dd24c238e86c57e97f919af7fbf8ee3d79b737':
  vold: suppress unused argument warning messages