am 7d587c31: (-s ours) Merge "Silence warnings about unused parameters."

* commit '7d587c31d5c9a2f76f69073036f521dc75045656':
  Silence warnings about unused parameters.
This commit is contained in:
Dan Albert 2014-09-11 03:44:14 +00:00 committed by Android Git Automerger
commit c16acacd6d

Diff Content Not Available