tree 8aa8d658414ca5b75abeb7d3a7b425cdee547b16
parent f37ad284433d0b858a1b147ab25a3c767b486689
parent 737c0c5c1a02f308fa77a28414c20272e48f202e
author Pawin Vongmasa <pawin@google.com> 1471629485 +0000
committer android-build-merger <android-build-merger@google.com> 1471629485 +0000

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am: 7a66bd2404 am: c776d9b42f am: 06985c1dbc am: a25f2f5359 am: 1f84a02d15 am: 2482c5e73f am: 5da4e686f8 am: d2cfa11dc2 am: 95977e6602
am: 737c0c5c1a

Change-Id: I6e7075b180936f0c9750f1cac29b2a786bbe7c47