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

Change-Id: I66142b7ed575f76a6e20400daead93df0a139291


Trivial merge