tree 0a2edcca354ed577b051c36f85013740717ae3de
parent 57caa90f7477ba972cc93267dcad9faafc6e888a
parent 6cadc73deacac285ec43cc6b30c742cfd3855bac
author Tao Bao <tbao@google.com> 1507779089 +0000
committer android-build-merger <android-build-merger@google.com> 1507779089 +0000

Merge "Drop -Wno-unused-parameter." am: a0e9742796
am: 6cadc73dea

Change-Id: Ib9bb6362481315466c12575b62900bf61747eafc