Fix warning introduced in 2c9e3ec9 am: 521361d83d am: 19bf995047 am: 80b99cc54a am...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 21:06:35 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:06:35 +0000 (21:06 +0000)
am: 2545942815

Change-Id: Iaea74315782dbb087b385e435b1f091e6e095fce


Trivial merge