tree 8986e619301ae9b68b9abccf173f04856870ea81
parent d3106c42c5466362da9bfb9f7453e5d60af83579
parent d4ca4eae8015e95e1eb02358c720be66e93ca6d8
author Chih-hung Hsieh <chh@google.com> 1513381731 +0000
committer android-build-merger <android-build-merger@google.com> 1513381731 +0000

Merge "Fix warning of unused parameter." am: c42a87ece8 am: bde0da845d
am: d4ca4eae80

Change-Id: I4d012ef759af8a8c8c7119500834358c34cf883e