tree 953230748fd7abf33c89880946114903f7306527
parent ddbf95f2048f1b3d7bd8e54621acc11227261907
parent d89a28b35a22fce7b37efd9a51606c40abc1cf1f
author Stephen Hines <srhines@google.com> 1511296647 +0000
committer android-build-merger <android-build-merger@google.com> 1511296647 +0000

Merge "Suppress unused parameter and deprecated declaration warnings on Darwin."
am: d89a28b35a

Change-Id: If5408a4a322ce37e7940da450f386611754a1d6a