OSDN Git Service

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:54:47 +0000 (17:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:54:47 +0000 (17:54 +0000)
am: 1dd4973234

Change-Id: I723ac6216066ec3df3af8e8caad2c6b6361727f4


Trivial merge