Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: 80b99cc54a am...
authorPyry Haulos <phaulos@google.com>
Fri, 17 Mar 2017 12:48:34 +0000 (12:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Mar 2017 12:48:34 +0000 (12:48 +0000)
am: 8aa6812b7c

Change-Id: I6328d884f5f11d2e4ebbb4b1d1dce10429ba920e


Trivial merge