tree 8aa8d658414ca5b75abeb7d3a7b425cdee547b16
parent 54160c7d67fd1957e3677f8be6e279b1e3299cc5
parent 8ab082c4f56719538c2312ba38440124b8e01af0
author Pawin Vongmasa <pawin@google.com> 1471629485 +0000
committer android-build-merger <android-build-merger@google.com> 1471629485 +0000

Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: baa9146401 am: 0aaa2c606c am: 784c8ac91a am: b65f47d30a am: 1cdd3c4262 am: 0954180087 am: be50e42a6c am: d82d9f0b1f am: dd6fc9a192
am: 8ab082c4f5

Change-Id: I9ab308a8f8fbe8579b8748ce1e7758ef1bd5c9f8