Fix warning introduced in 2c9e3ec9 am: d8b452a753 am: 03dde47b9d
authorPyry Haulos <phaulos@google.com>
Wed, 15 Mar 2017 20:58:31 +0000 (20:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Mar 2017 20:58:31 +0000 (20:58 +0000)
am: 9333757172

Change-Id: I21fae7ac4017a87680f3b9788b7787eb7a7bfc0f


Trivial merge