Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 5f34117776 am: eba2559865
authorPyry Haulos <phaulos@google.com>
Fri, 17 Mar 2017 12:18:04 +0000 (12:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Mar 2017 12:18:04 +0000 (12:18 +0000)
am: 99f3ab7c5a

Change-Id: I94915828f9db6edce08b0ca860de8f7eeb6ffdd8


Trivial merge