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

Change-Id: I0afde27c779a151404e06f25045d3d757bdb74ae


Trivial merge