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

Change-Id: Ibf686c314b69cadd674b568a60084fa1f2f8434d


Trivial merge