tree 9b27e38be2d8c82d8c5f8338cfd0d398451a5e5a
parent 9d62b40b551d6d86d8f92bf15a02c5a181473d43
parent b7843952f0e8d548534f6e321516856be6db611d
author Gaurav Shah <gauravsh@google.com> 1446493066 +0000
committer android-build-merger <android-build-merger@google.com> 1446493066 +0000

Merge "Add -Wno-unused-parameter when using libchrome." am: 19a1dcea54
am: b7843952f0

* commit 'b7843952f0e8d548534f6e321516856be6db611d':
  Add -Wno-unused-parameter when using libchrome.