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

Change-Id: I79c64f4d5c3d494e7c5f11df44a00478648e581a


Trivial merge